Skip to content

#61 Fix missing discriminator if ADT element was reregistered in non-ADT context #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 14, 2024
Merged

#61 Fix missing discriminator if ADT element was reregistered in non-ADT context #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion library/src/main/scala/za/co/absa/springdocopenapiscala/OpenAPIModelRegistration.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,9 @@ class OpenAPIModelRegistration(
}

private def registerAsReference(name: String, schema: Schema[_]): Schema[_] = {
components.addSchemas(name, schema)
if (!Option(components.getSchemas).exists(_.containsKey(name))) {
components.addSchemas(name, schema)
}
val schemaReference = new Schema
schemaReference.set$ref(s"#/components/schemas/$name")
schemaReference
Expand Down
10 changes: 10 additions & 0 deletions library/src/test/scala/za/co/absa/springdocopenapiscala/OpenAPIModelRegistrationSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ class OpenAPIModelRegistrationSpec extends AnyFlatSpec {

private sealed trait NestedSealedTrait

private case class NestedSealedTraitBreaker(breaker: NestedSealedTrait.NestedSealedTraitVariant1)

private object NestedSealedTrait {
case class NestedSealedTraitVariant1(a: String, b: Int, c: NestedSealedTrait) extends NestedSealedTrait
case object NestedSealedTraitVariant2 extends NestedSealedTrait
Expand Down Expand Up @@ -396,6 +398,7 @@ class OpenAPIModelRegistrationSpec extends AnyFlatSpec {
)

openAPIModelRegistration.register[NestedSealedTrait]()
openAPIModelRegistration.register[NestedSealedTraitBreaker]()

val actualSchemas = components.getSchemas

Expand Down Expand Up @@ -535,6 +538,13 @@ class OpenAPIModelRegistrationSpec extends AnyFlatSpec {
areDiscriminatorPropertyRequired
}
)

assertTypeAndFormatAreAsExpected(actualSchemas, "NestedSealedTraitBreaker", "object")
assertRefIsAsExpected(
actualSchemas,
"NestedSealedTraitBreaker.breaker",
"#/components/schemas/NestedSealedTraitVariant1"
)
}

it should "add discriminator to sealed types " +
Expand Down