id/type split (allOf object), #65

Author: hauner

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

@@ -103,7 +103,7 @@ class DataTypeConverter(
             }
 
             objectType = AllOfObjectDataType(
-                schemaInfo.getName(),
+                DataTypeName(schemaInfo.getName(), getTypeNameWithSuffix(schemaInfo.getName())),
                 listOf(options.packageName, "model").joinToString ("."),
                 items,
                 null,

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

@@ -9,7 +9,7 @@ package io.openapiprocessor.core.model.datatypes
  * OpenAPI "allOf" composed schema type.
  */
 class AllOfObjectDataType(
-    private val type: String,
+    private val name: DataTypeName,
     private val pkg: String,
     private val items: List<DataType> = emptyList(),
     override val constraints: DataTypeConstraints? = null,
@@ -18,15 +18,19 @@ class AllOfObjectDataType(
 ): DataType, ModelDataType {
 
     override fun getName(): String {
-        return type
+        return name.id
+    }
+
+    override fun getTypeName(): String {
+        return name.type
     }
 
     override fun getPackageName(): String {
         return pkg
     }
 
     override fun getImports(): Set<String> {
-        return setOf(getPackageName() + "." + getName())
+        return setOf(getPackageName() + "." + getTypeName())
     }
 
     override val referencedImports: Set<String>

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

@@ -12,7 +12,7 @@ import io.openapiprocessor.core.support.datatypes.ObjectDataType
 class ComposedObjectDataTypeSpec : StringSpec({
 
     "loop properties of allOf objects as if it was a single object" {
-        val composed = AllOfObjectDataType("Foo", "pkg", listOf(
+        val composed = AllOfObjectDataType(DataTypeName("Foo"), "pkg", listOf(
             ObjectDataType("Foo", "pkg", linkedMapOf(
                 Pair("foo", StringDataType()),
                 Pair("foobar", StringDataType())
@@ -26,4 +26,17 @@ class ComposedObjectDataTypeSpec : StringSpec({
         composed.properties.keys shouldBe linkedSetOf("foo", "foobar", "bar", "barfoo")
     }
 
+    "allOf object has id name and type name" {
+        val composed = AllOfObjectDataType(DataTypeName("Foo", "FooX"), "pkg", listOf())
+
+        composed.getName() shouldBe "Foo"
+        composed.getTypeName() shouldBe "FooX"
+    }
+
+    "allOf object has creates import with type name" {
+        val composed = AllOfObjectDataType(DataTypeName("Foo", "FooX"), "pkg", listOf())
+
+        composed.getImports() shouldBe setOf("pkg.FooX")
+    }
+
 })