Skip to content
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

Fixes async api encoding when using discriminator (#43). #178

Merged
merged 1 commit into from
Jul 26, 2024
Merged

Fixes async api encoding when using discriminator (#43). #178

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
5 changes: 5 additions & 0 deletions asyncapi-circe/src/main/scala/sttp/apispec/asyncapi/circe/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ package circe {
import sttp.apispec.internal.JsonSchemaCirceEncoders

trait SttpAsyncAPICirceEncoders extends JsonSchemaCirceEncoders {
// note: avoids rendering of (unsupported) discriminator mapping
override implicit val encoderDiscriminator: Encoder[Discriminator] = {
case Discriminator(propertyName, _) => Json.obj("discriminator" := propertyName)
}

// note: these are strict val-s, order matters!
implicit val encoderReference: Encoder[Reference] = deriveEncoder[Reference]
implicit def encoderReferenceOr[T: Encoder]: Encoder[ReferenceOr[T]] = {
Expand Down
27 changes: 27 additions & 0 deletions asyncapi-circe/src/test/scala/sttp/apispec/asyncapi/circe/EncoderTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,33 @@ class EncoderTest extends AnyFunSuite {
assert(expected === comp.asJson.deepDropNullValues)
}

test("encode discriminator") {
val expected =
parse("""{
| "payload" : {
| "oneOf" : [
| {
| "$ref" : "Dog"
| },
| {
| "$ref" : "Cat"
| }
| ],
| "discriminator" : {
| "discriminator" : "pet"
| }
| }
|}""".stripMargin)

val schema = Schema.oneOf(
List(Schema.referenceTo("", "Dog"), Schema.referenceTo("", "Cat")),
Some(Discriminator("pet", Some(ListMap("Dog" -> "Dog", "Cat" -> "Cat")))))
val message = SingleMessage(payload = Some(Right(schema)))

assert(expected === message.asJson.deepDropNullValues)
}



def parse(s: String): Json = io.circe.parser.parse(s).fold(throw _, identity)
}
Loading