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

Commit b17d697

Browse files
committed
fix merge of #43
1 parent 3cb4571 commit b17d697

File tree

4 files changed

+8
-13
lines changed

4 files changed

+8
-13
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,8 @@ class ComposedObjectDataType(
7474
return properties
7575
}
7676

77+
override fun isRequired(prop: String): Boolean {
78+
return getConstraints()?.isRequired(prop) ?: false
79+
}
80+
7781
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ interface ModelDataType: DataType {
1111

1212
fun getProperties(): Map<String, DataType>
1313

14+
fun isRequired(prop: String): Boolean
15+
1416
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class ObjectDataType(
6868
return properties
6969
}
7070

71-
fun isRequired(prop: String): Boolean {
71+
override fun isRequired(prop: String): Boolean {
7272
return getConstraints()?.isRequired(prop) ?: false
7373
}
7474

src/main/kotlin/io/openapiprocessor/core/writer/java/DataTypeWriter.kt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -132,19 +132,8 @@ class DataTypeWriter(
132132
if (apiOptions.beanValidation) {
133133
val properties = dataType.getProperties()
134134
properties.forEach { (propName, propDataType) ->
135-
val javaPropertyName = toCamelCase(propName)
136-
137-
imports.addAll(validationAnnotations.collectImports(
138-
propDataType,
139-
dataType.isRequired(propName)))
140-
}
141-
142-
143-
val propertyNames = dataType.getProperties().keys
144-
propertyNames.forEach {
145-
val propDataType = dataType.getObjectProperty(it)
146135
imports.addAll(validationAnnotations.collectImports(
147-
propDataType, dataType.isRequired(it)))
136+
propDataType, dataType.isRequired(propName)))
148137
}
149138
}
150139

0 commit comments

Comments
 (0)