Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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)
}