Merge branch 'main' into harshbhat/remove-recordName

zio · Aug 15, 2024 · fbf4370 · fbf4370
2 parents dee157e + ce8cca1
commit fbf4370
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/zio-schema-json/shared/src/main/scala/zio/schema/codec/JsonCodec.scala b/zio-schema-json/shared/src/main/scala/zio/schema/codec/JsonCodec.scala
@@ -945,6 +945,7 @@ object JsonCodec {
 
       val isEmptyCollection = value match {
         case _: Iterable[_] => value.asInstanceOf[Iterable[_]].isEmpty
+        case None           => true
         case _              => false
       }
 

diff --git a/zio-schema-json/shared/src/test/scala/zio/schema/codec/JsonCodecSpec.scala b/zio-schema-json/shared/src/test/scala/zio/schema/codec/JsonCodecSpec.scala
@@ -423,7 +423,7 @@ object JsonCodecSpec extends ZIOSpecDefault {
           RecordExample.schema.annotate(rejectExtraFields()),
           RecordExample(f1 = Some("test"), f3 = Some("transient")),
           charSequenceToByteChunk(
-            """{"$f1":"test","f2":null,"f4":null,"f5":null,"f6":null,"f7":null,"f8":null,"f9":null,"f10":null,"f11":null,"f12":null,"f13":null,"f14":null,"f15":null,"f16":null,"f17":null,"f18":null,"f19":null,"f20":null,"f21":null,"f22":null,"$f23":null}""".stripMargin
+            """{"$f1":"test"}""".stripMargin
           )
         )
       }