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

support nullable for anyOf & oneOf #118

Closed
wants to merge 1 commit into from
Closed

support nullable for anyOf & oneOf #118

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
14 changes: 9 additions & 5 deletions jsonschema-circe/src/main/scala/sttp/apispec/internal/JsonSchemaCirceEncoders.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ trait JsonSchemaCirceEncoders {

def openApi30: Boolean = false

private[apispec] def addNullable(isNullable: Option[Boolean])(json: Json, f: Json => Json): Json =
if (isNullable.getOrElse(false)) f(json) else json

val jsonSchemaEncoder: Encoder[Schema] = Encoder.AsObject
.instance { (s: Schema) =>
val minKey = if (s.exclusiveMinimum.getOrElse(false)) "exclusiveMinimum" else "minimum"
Expand All @@ -22,12 +25,12 @@ trait JsonSchemaCirceEncoders {
s"$$ref" := s.$ref,
s"$$schema" := s.$schema,
"allOf" := s.allOf,
"anyOf" := s.anyOf,
"anyOf" := addNullable(s.nullable)
(s.anyOf.asJson, _.mapArray(anyOf => anyOf :+ Json.fromJsonObject(JsonObject(("type", Json.fromString("null")))))),
"title" := s.title,
"required" := s.required,
"type" := (if (s.nullable.getOrElse(false))
s.`type`.map(s => Json.arr(s.asJson, Json.fromString("null"))).asJson
else s.`type`.asJson),
"type" := addNullable(s.nullable)
(s.`type`.asJson, json => Json.arr(json, Json.fromString("null"))),
"prefixItems" := s.prefixItems,
"items" := s.items,
"contains" := s.contains,
Expand All @@ -40,7 +43,8 @@ trait JsonSchemaCirceEncoders {
"writeOnly" := s.writeOnly,
"example" := s.example,
"deprecated" := s.deprecated,
"oneOf" := s.oneOf,
"oneOf" := addNullable(s.nullable)
(s.oneOf.asJson, _.mapArray(oneOf => oneOf :+ Json.fromJsonObject(JsonObject(("type", Json.fromString("null")))))),
"discriminator" := s.discriminator,
"additionalProperties" := s.additionalProperties,
"pattern" := s.pattern,
Expand Down
Loading