Skip to content

Commit 5de6ddf

Browse files
committed
Post review improvements
1 parent d5a16af commit 5de6ddf

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,9 @@ val registration = OpenAPIModelRegistration(
225225
components,
226226
config = RegistrationConfig(
227227
OpenAPIModelRegistration.RegistrationConfig(
228-
sumADTsShape = OpenAPIModelRegistration.RegistrationConfig.SumADTsShape.WithDiscriminator()
228+
sumADTsShape =
229+
// default values apply for discriminatorPropertyNameFn, addDiscriminatorPropertyOnlyToDirectChildren
230+
OpenAPIModelRegistration.RegistrationConfig.SumADTsShape.WithDiscriminator()
229231
)
230232
)
231233
)

library/src/main/scala/za/co/absa/springdocopenapiscala/OpenAPIModelRegistration.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,10 @@ class OpenAPIModelRegistration(
160160
val constEnumSchema = createConstEnumSchema(discriminatorValue.getOrElse(name))
161161
actualSchema.addProperty(discriminatorPropertyName, constEnumSchema)
162162
actualSchema.addRequiredItem(discriminatorPropertyName)
163-
} else if (!addOnlyToDirectChildren && Option(actualSchema.getOneOf).map(!_.isEmpty).getOrElse(false)) {
163+
} else if (
164+
!addOnlyToDirectChildren &&
165+
Option(actualSchema.getOneOf).map(!_.isEmpty).getOrElse(false) // is schema representing another sum ADT root
166+
) {
164167
addDiscriminatorPropertyToChildren(
165168
actualSchema,
166169
discriminatorPropertyName,

0 commit comments

Comments
 (0)