Skip to content
This repository was archived by the owner on Mar 16, 2025. It is now read-only.

Commit 3791354

Browse files
committed
#92, improve naming
1 parent 577af49 commit 3791354

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,8 @@ class DataTypeConverter(
305305
)
306306

307307
return NoDataType(
308-
schemaInfo.getName(),
308+
DataTypeName(schemaInfo.getName(), getTypeNameWithSuffix(schemaInfo.getName())),
309+
listOf(options.packageName, "model").joinToString("."),
309310
constraints = constraints,
310311
deprecated = schemaInfo.getDeprecated()
311312
)

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@ package io.openapiprocessor.core.model.datatypes
1313
* - $ref: '#/components/schemas/Foo'
1414
*/
1515
class NoDataType(
16-
private val name: String,
16+
private val name: DataTypeName,
17+
private val pkg: String,
1718
override val constraints: DataTypeConstraints? = null,
1819
override val deprecated: Boolean = false
1920
): DataType {
2021

2122
override fun getName(): String {
22-
return name
23+
return name.id
2324
}
2425

2526
override fun getPackageName(): String {
26-
return "io.openapiprocessor.leaked"
27+
return pkg
2728
}
2829

2930
override fun getImports(): Set<String> {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class ComposedObjectDataTypeSpec : StringSpec({
6464
ObjectDataType("Bar", "pkg", linkedMapOf(
6565
"bar" to propertyDataTypeString()
6666
)),
67-
NoDataType("Leak")
67+
NoDataType(DataTypeName("Leak"), "pkg")
6868
))
6969

7070
composed.getImports() shouldBe setOf("pkg.Foo")

0 commit comments

Comments
 (0)