Skip to content

Commit 13c649f

Browse files
committed
refactor: make the code more ideomatic
1 parent 6b93afb commit 13c649f

1 file changed

Lines changed: 11 additions & 10 deletions

File tree

‎openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/DataTypeConverter.kt‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class DataTypeConverter(
117117

118118
val allOf = AllOfObjectDataType(
119119
DataTypeName(schemaInfo.getName(), getTypeNameWithSuffix(schemaInfo.getName())),
120-
listOf(options.packageName, "model").joinToString("."),
120+
"${options.packageName}.model",
121121
items,
122122
schemaInfo.getDeprecated()
123123
)
@@ -134,7 +134,7 @@ class DataTypeConverter(
134134

135135
val objectType = InterfaceDataType(
136136
DataTypeName(schemaInfo.getName(), getTypeNameWithSuffix(schemaInfo.getName())),
137-
listOf(options.packageName, "model").joinToString("."),
137+
"${options.packageName}.model",
138138
items,
139139
constraints,
140140
schemaInfo.getDeprecated(),
@@ -150,7 +150,7 @@ class DataTypeConverter(
150150
else -> {
151151
AnyOneOfObjectDataType(
152152
schemaInfo.getName(),
153-
listOf(options.packageName, "model").joinToString("."),
153+
"${options.packageName}.model",
154154
schemaInfo.itemOf()!!,
155155
items,
156156
null,
@@ -249,18 +249,19 @@ class DataTypeConverter(
249249
val interfaceName = schemaInfo.interfaceName!!
250250
val interfaceType = InterfaceDataType(
251251
DataTypeName(interfaceName, getTypeNameWithSuffix2(interfaceName)),
252-
listOf(options.packageName, "model").joinToString("."),
252+
"${options.packageName}.model",
253253
emptyList(),
254254
constraints,
255255
schemaInfo.getDeprecated(),
256256
Documentation(description = schemaInfo.description)
257257
)
258258

259259
val found = dataTypes.find(interfaceType.getName())
260-
if (found != null && found is InterfaceDataType) {
261-
found.addItem(objectType)
262-
objectType.addInterface(found)
263-
return found
260+
if (found is InterfaceDataType) {
261+
return found.apply {
262+
addItem(objectType)
263+
objectType.addInterface(this)
264+
}
264265
}
265266

266267
interfaceType.addItem(objectType)
@@ -389,7 +390,7 @@ class DataTypeConverter(
389390

390391
val dataType = NoDataType(
391392
DataTypeName(schemaInfo.getName(), getTypeNameWithSuffix(schemaInfo.getName())),
392-
listOf(options.packageName, "model").joinToString("."),
393+
"${options.packageName}.model",
393394
constraints = constraints,
394395
deprecated = schemaInfo.getDeprecated()
395396
)
@@ -460,7 +461,7 @@ class DataTypeConverter(
460461
@Suppress("UNCHECKED_CAST")
461462
val enumType = StringEnumDataType(
462463
DataTypeName(enumName, getTypeNameWithSuffix(enumName)),
463-
listOf(options.packageName, "model").joinToString("."),
464+
"${options.packageName}.model",
464465
schemaInfo.getEnumValues() as List<String>,
465466
constraints,
466467
schemaInfo.getDeprecated(),

0 commit comments

Comments
 (0)