handle id/type split (object), #65

Author: hauner

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

@@ -200,7 +200,7 @@ class DataTypeConverter(
         )
 
         val objectType = ObjectDataType (
-            getNameWithSuffix(schemaInfo.getName()),
+            DataTypeName(schemaInfo.getName(), getTypeNameWithSuffix(schemaInfo.getName())),
             listOf(options.packageName, "model").joinToString("."),
             properties = properties,
             constraints = constraints,

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

@@ -10,17 +10,22 @@ import io.openapiprocessor.core.model.Documentation
 /**
  * OpenAPI named object schemas type or an inline object schema.
  */
-class ObjectDataType(
-    private val type: String,
+open class ObjectDataType(
+    private val name: DataTypeName,
     private val pkg: String,
-    private val properties: LinkedHashMap<String, DataType> = linkedMapOf(), // preserves order
+    /** linked map to preserve order */
+    private val properties: LinkedHashMap<String, DataType> = linkedMapOf(),
     override val constraints: DataTypeConstraints? = null,
     override val deprecated: Boolean = false,
     override val documentation: Documentation? = null
 ): DataType, ModelDataType {
 
     override fun getName(): String {
-        return type
+        return name.id
+    }
+
+    override fun getTypeName(): String {
+        return name.type
     }
 
     override fun getPackageName(): String {

src/test/groovy/com/github/hauner/openapi/core/learn/PropertyNotationSpec.groovy

@@ -1,6 +1,6 @@
 package com.github.hauner.openapi.core.learn
 
-import io.openapiprocessor.core.model.datatypes.ObjectDataType
+import io.openapiprocessor.core.support.datatypes.ObjectDataType
 import io.openapiprocessor.core.model.datatypes.DataType
 import spock.lang.Specification
 

src/test/groovy/com/github/hauner/openapi/core/model/EndpointContentTypesSpec.groovy

@@ -6,8 +6,8 @@
 package com.github.hauner.openapi.core.model
 
 import io.openapiprocessor.core.model.HttpMethod
-import io.openapiprocessor.core.model.datatypes.ObjectDataType
 import io.openapiprocessor.core.model.datatypes.StringDataType
+import io.openapiprocessor.core.support.datatypes.ObjectDataType
 import spock.lang.Specification
 
 import static io.openapiprocessor.core.builder.api.EndpointBuilderKt.endpoint

src/test/groovy/com/github/hauner/openapi/core/writer/java/BeanValidationFactorySpec.groovy

@@ -15,8 +15,8 @@ import io.openapiprocessor.core.model.datatypes.DoubleDataType
 import io.openapiprocessor.core.model.datatypes.FloatDataType
 import io.openapiprocessor.core.model.datatypes.IntegerDataType
 import io.openapiprocessor.core.model.datatypes.LongDataType
-import io.openapiprocessor.core.model.datatypes.ObjectDataType
 import io.openapiprocessor.core.model.datatypes.StringDataType
+import io.openapiprocessor.core.support.datatypes.ObjectDataType
 import io.openapiprocessor.core.writer.java.BeanValidationFactory
 import spock.lang.Specification
 import spock.lang.Unroll

src/test/groovy/com/github/hauner/openapi/core/writer/java/DataTypeWriterSpec.groovy

@@ -17,9 +17,9 @@
 package com.github.hauner.openapi.core.writer.java
 
 import io.openapiprocessor.core.converter.ApiOptions
-import io.openapiprocessor.core.support.datatypes.ListDataType
-import io.openapiprocessor.core.model.datatypes.ObjectDataType
 import io.openapiprocessor.core.model.datatypes.StringDataType
+import io.openapiprocessor.core.support.datatypes.ListDataType
+import io.openapiprocessor.core.support.datatypes.ObjectDataType
 import io.openapiprocessor.core.writer.java.BeanValidationFactory
 import io.openapiprocessor.core.writer.java.DataTypeWriter
 import io.openapiprocessor.core.writer.java.JavaDocWriter

src/test/groovy/com/github/hauner/openapi/core/writer/java/MethodWriterSpec.groovy

@@ -12,6 +12,7 @@ import io.openapiprocessor.core.model.HttpMethod
 import io.openapiprocessor.core.model.datatypes.*
 import io.openapiprocessor.core.model.parameters.Parameter
 import io.openapiprocessor.core.model.parameters.ParameterBase
+import io.openapiprocessor.core.support.datatypes.ObjectDataType
 import io.openapiprocessor.core.writer.java.BeanValidationFactory
 import io.openapiprocessor.core.writer.java.JavaDocWriter
 import io.openapiprocessor.core.writer.java.MethodWriter

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

@@ -64,7 +64,8 @@ class DataTypeConverterSuffixSpec: StringSpec({
         dataTypes.find("Foo") shouldBeSameInstanceAs datatype
 
         datatype.shouldBeInstanceOf<ObjectDataType>()
-        datatype.getName().shouldBe("FooSuffix")
+        datatype.getName().shouldBe("Foo")
+        datatype.getTypeName().shouldBe("FooSuffix")
     }
 
     "ignores suffix if model data type name already ends with the suffix" {
@@ -113,6 +114,7 @@ class DataTypeConverterSuffixSpec: StringSpec({
 
         datatype.shouldBeInstanceOf<ObjectDataType>()
         datatype.getName().shouldBe("FooWithSuffix")
+        datatype.getTypeName().shouldBe("FooWithSuffix")
     }
 
     "adds suffix to model enum data type name" {

src/test/kotlin/io/openapiprocessor/core/model/DataTypesSpec.kt

@@ -8,9 +8,9 @@ package io.openapiprocessor.core.model
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.shouldBe
 import io.openapiprocessor.core.model.datatypes.DataTypeName
-import io.openapiprocessor.core.model.datatypes.ObjectDataType
 import io.openapiprocessor.core.model.datatypes.StringDataType
 import io.openapiprocessor.core.model.datatypes.StringEnumDataType
+import io.openapiprocessor.core.support.datatypes.ObjectDataType
 
 class DataTypesSpec : StringSpec({
 

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

@@ -7,6 +7,7 @@ package io.openapiprocessor.core.model.datatypes
 
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.shouldBe
+import io.openapiprocessor.core.support.datatypes.ObjectDataType
 
 class ComposedObjectDataTypeSpec : StringSpec({
 

src/test/kotlin/io/openapiprocessor/core/support/datatypes/ObjectDataType.kt

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021 https://github.com/openapi-processor/openapi-processor-core
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.core.support.datatypes
+
+import io.openapiprocessor.core.model.Documentation
+import io.openapiprocessor.core.model.datatypes.DataType
+import io.openapiprocessor.core.model.datatypes.DataTypeConstraints
+import io.openapiprocessor.core.model.datatypes.DataTypeName
+import io.openapiprocessor.core.model.datatypes.ObjectDataType
+
+/**
+ * easier test migration
+ */
+class ObjectDataType(
+    nameId: String,
+    pkg: String,
+    properties: LinkedHashMap<String, DataType> = linkedMapOf(),
+    constraints: DataTypeConstraints? = null,
+    deprecated: Boolean = false,
+    documentation: Documentation? = null
+): ObjectDataType(DataTypeName(nameId), pkg, properties, constraints, deprecated, documentation)

src/test/kotlin/io/openapiprocessor/core/writer/java/ApiWriterSpec.kt

@@ -17,6 +17,7 @@ import io.openapiprocessor.core.model.Api
 import io.openapiprocessor.core.model.DataTypes
 import io.openapiprocessor.core.model.Interface
 import io.openapiprocessor.core.model.datatypes.*
+import io.openapiprocessor.core.support.datatypes.ObjectDataType
 import io.openapiprocessor.core.support.text
 import io.openapiprocessor.core.tempFolder
 import java.io.File

src/test/kotlin/io/openapiprocessor/core/writer/java/BeanValidationFactorySpec.kt

@@ -9,6 +9,7 @@ import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.shouldBe
 import io.openapiprocessor.core.model.datatypes.*
+import io.openapiprocessor.core.support.datatypes.ObjectDataType
 
 class BeanValidationFactorySpec: StringSpec({
 

src/test/kotlin/io/openapiprocessor/core/writer/java/DataTypeWriterSpec.kt

@@ -12,7 +12,7 @@ import io.mockk.mockk
 import io.openapiprocessor.core.converter.ApiOptions
 import io.openapiprocessor.core.extractImports
 import io.openapiprocessor.core.model.datatypes.DataTypeConstraints
-import io.openapiprocessor.core.model.datatypes.ObjectDataType
+import io.openapiprocessor.core.support.datatypes.ObjectDataType
 import io.openapiprocessor.core.model.datatypes.StringDataType
 import java.io.StringWriter
 

src/test/kotlin/io/openapiprocessor/core/writer/java/InterfaceWriterSpec.kt

@@ -23,6 +23,7 @@ import io.openapiprocessor.core.model.datatypes.*
 import io.openapiprocessor.core.model.parameters.AdditionalParameter
 import io.openapiprocessor.core.model.parameters.Parameter
 import io.openapiprocessor.core.model.parameters.ParameterBase
+import io.openapiprocessor.core.support.datatypes.ObjectDataType
 import java.io.StringWriter
 import java.io.Writer
 import io.mockk.mockk as stub

src/test/kotlin/io/openapiprocessor/core/writer/java/JavaDocWriterSpec.kt

@@ -16,6 +16,7 @@ import io.openapiprocessor.core.builder.api.endpoint
 import io.openapiprocessor.core.model.Documentation
 import io.openapiprocessor.core.model.datatypes.*
 import io.openapiprocessor.core.model.parameters.ParameterBase
+import io.openapiprocessor.core.support.datatypes.ObjectDataType
 
 class JavaDocWriterSpec: StringSpec({