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

Jump to bottom

Accept empty object for optional json values (#647) #653

Merged
merged 1 commit into from
Jan 30, 2024
Merged

Accept empty object for optional json values (#647) #653

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
32 changes: 30 additions & 2 deletions zio-schema-json/shared/src/main/scala/zio/schema/codec/JsonCodec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package zio.schema.codec
import java.nio.CharBuffer
import java.nio.charset.StandardCharsets

import scala.annotation.tailrec
import scala.annotation.{ switch, tailrec }
import scala.collection.immutable.ListMap

import zio.json.JsonCodec._
Expand Down Expand Up @@ -549,10 +549,38 @@ object JsonCodec {
case _: ZJsonDecoder[_] =>
}

private[schema] def option[A](implicit A: ZJsonDecoder[A]): ZJsonDecoder[Option[A]] =
new ZJsonDecoder[Option[A]] { self =>
private[this] val ull: Array[Char] = "ull".toCharArray

override def unsafeDecodeMissing(trace: List[JsonError]): Option[A] =
Option.empty

def unsafeDecode(trace: List[JsonError], in: RetractReader): Option[A] =
(in.nextNonWhitespace(): @switch) match {
case 'n' =>
Lexer.readChars(trace, in, ull, "null")
None
case '{' =>
Lexer.readChars(trace, in, "}".toCharArray, "{}")
None
case _ =>
in.retract()
Some(A.unsafeDecode(trace, in))
}

final override def unsafeFromJsonAST(trace: List[JsonError], json: Json): Option[A] =
json match {
case Json.Null => None
case Json.Obj(Chunk()) => None
case _ => Some(A.unsafeFromJsonAST(trace, json))
}
}

//scalafmt: { maxColumn = 400, optIn.configStyleArguments = false }
private[codec] def schemaDecoder[A](schema: Schema[A], discriminator: Int = -1): ZJsonDecoder[A] = schema match {
case Schema.Primitive(standardType, _) => primitiveCodec(standardType).decoder
case Schema.Optional(codec, _) => ZJsonDecoder.option(schemaDecoder(codec, discriminator))
case Schema.Optional(codec, _) => option(schemaDecoder(codec, discriminator)).orElse(Json.decoder.mapOrFail(ast => if (ast.asObject.exists(_.isEmpty)) Right(None) else Left("None empty object")))
case Schema.Tuple2(left, right, _) => ZJsonDecoder.tuple2(schemaDecoder(left, -1), schemaDecoder(right, -1))
case Schema.Transform(c, f, _, a, _) => schemaDecoder(a.foldLeft(c)((s, a) => s.annotate(a)), discriminator).mapOrFail(f)
case Schema.Sequence(codec, f, _, _, _) => ZJsonDecoder.chunk(schemaDecoder(codec, -1)).map(f)
Expand Down
7 changes: 7 additions & 0 deletions zio-schema-json/shared/src/test/scala-2/zio/schema/codec/JsonCodecSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,13 @@ object JsonCodecSpec extends ZIOSpecDefault {
WithOptionFields(Some("s"), None),
charSequenceToByteChunk("""{"a":"s"}""")
)
},
test("case class with option fields accept empty json object as value") {
assertDecodes(
WithOptionFields.schema,
WithOptionFields(Some("s"), None),
charSequenceToByteChunk("""{"a":"s", "b":{}}""")
)
}
),
suite("enums")(
Expand Down
Loading