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

Commit 48d7716

Browse files
committed
check named mapping first to allow primitive schema mapping
1 parent 6861b41 commit 48d7716

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

src/main/kotlin/io/openapiprocessor/core/converter/mapping/MappingFinder.kt

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -284,13 +284,21 @@ class IoMatcher(schema: MappingSchema): BaseVisitor(schema) {
284284
class TypeMatcher(schema: MappingSchema): BaseVisitor(schema) {
285285

286286
override fun match(mapping: TypeMapping): Boolean {
287-
return if(schema.isPrimitive()) {
288-
mapping.sourceTypeName == schema.getType()
289-
&& mapping.sourceTypeFormat == schema.getFormat()
290-
} else if(schema.isArray()) {
291-
mapping.sourceTypeName == "array"
292-
} else {
293-
mapping.sourceTypeName == schema.getName()
287+
if (mapping.sourceTypeName == schema.getName()) {
288+
return true
289+
}
290+
291+
return when {
292+
schema.isPrimitive() -> {
293+
mapping.sourceTypeName == schema.getType()
294+
&& mapping.sourceTypeFormat == schema.getFormat()
295+
}
296+
schema.isArray() -> {
297+
mapping.sourceTypeName == "array"
298+
}
299+
else -> {
300+
false
301+
}
294302
}
295303
}
296304

0 commit comments

Comments
 (0)