Skip to content

Fix support of fieldName annotations in JSON codecs for case classes with 1 to 22 fields #774

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
987Nabil merged 2 commits into from
Jan 9, 2025
Merged

Fix support of fieldName annotations in JSON codecs for case classes with 1 to 22 fields #774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
954bf39
Fix support of fieldName annotations in JSON codecs for case classes …
plokhotnyuk Jan 9, 2025
ed0ad54
Merge branch 'main' into fix-support-of-fieldname-annotations-in-json…
plokhotnyuk Jan 9, 2025
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
9 changes: 3 additions & 6 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 @@ -1152,7 +1152,7 @@ object JsonCodec {
out.write(',')
if (doPrettyPrint) pad(indent_, out)
}
strEnc.unsafeEncode(schema.name, indent_, out)
strEnc.unsafeEncode(schema.fieldName, indent_, out)
if (doPrettyPrint) out.write(" : ")
else out.write(':')
enc.unsafeEncode(value, indent_, out)
Expand Down Expand Up @@ -1607,13 +1607,10 @@ object JsonCodec {
schema.fields.foreach { field =>
fields(idx) = field
decoders(idx) = schemaDecoder(field.schema)
val name = field.name.asInstanceOf[String]
val name = field.fieldName
names += name
spans += JsonError.ObjectAccess(name)
field.annotations.foreach {
case fna: fieldNameAliases => fna.aliases.foreach(a => aliases += ((a, idx)))
case _ =>
}
(field.nameAndAliases - name).foreach(a => aliases += ((a, idx)))
idx += 1
}
val hasDiscriminator = discriminator.isDefined
Expand Down
13 changes: 12 additions & 1 deletion zio-schema-json/shared/src/test/scala/zio/schema/codec/JsonCodecSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,13 @@ object JsonCodecSpec extends ZIOSpecDefault {
charSequenceToByteChunk("""{"id":1,"value":10,"description":"test"}""")
)
},
test("old field name rejected") {
assertDecodesToError(
Order.schema,
"""{"order-id":1,"value":10,"description":"test"}""",
JsonError.Message("missing") :: JsonError.ObjectAccess("orderId") :: Nil
)
},
test("field name with alias - no alias") {
assertDecodes(
Order.schema,
Expand Down Expand Up @@ -2310,7 +2317,11 @@ object JsonCodecSpec extends ZIOSpecDefault {
implicit lazy val schema: Schema[Subscription] = DeriveSchema.gen[Subscription]
}

case class Order(@fieldNameAliases("order_id", "id") orderId: Int, value: BigDecimal, description: String)
case class Order(
@fieldNameAliases("order_id", "id") @fieldName("orderId") `order-id`: Int,
value: BigDecimal,
description: String
)

object Order {
implicit lazy val schema: Schema[Order] = DeriveSchema.gen[Order]
Expand Down
Loading