Ways to ignore empty collections while encoding json

zio · Sep 7, 2023 · 6135e77 · 6135e77
1 parent a1d38fc
commit 6135e77
Show file tree

Hide file tree

Showing 5 changed files with 249 additions and 108 deletions.
diff --git a/zio-schema-examples/shared/src/main/scala/dev/zio/schema/example/example1/Example1.scala b/zio-schema-examples/shared/src/main/scala/dev/zio/schema/example/example1/Example1.scala
@@ -145,9 +145,11 @@ object JsonSample extends zio.ZIOAppDefault {
 
   override def run: ZIO[Environment with ZIOAppArgs, Any, Any] =
     for {
-      _                      <- ZIO.unit
-      person                 = Person("Michelle", 32)
-      personToJsonTransducer = JsonCodec.schemaBasedBinaryCodec[Person](schemaPerson).streamEncoder
+      _      <- ZIO.unit
+      person = Person("Michelle", 32)
+      personToJsonTransducer = JsonCodec
+        .schemaBasedBinaryCodec[Person](schemaPerson, JsonCodec.Config.default)
+        .streamEncoder
       _ <- ZStream(person)
             .via(personToJsonTransducer)
             .via(ZPipeline.utf8Decode)
@@ -192,8 +194,8 @@ object CombiningExample extends ZIOAppDefault {
       _      <- ZIO.debug("combining roundtrip")
       person = Person("Michelle", 32)
 
-      personToJson = JsonCodec.schemaBasedBinaryCodec[Person](schemaPerson).streamEncoder
-      jsonToPerson = JsonCodec.schemaBasedBinaryCodec[Person](schemaPerson).streamDecoder
+      personToJson = JsonCodec.schemaBasedBinaryCodec[Person](schemaPerson, JsonCodec.Config.default).streamEncoder
+      jsonToPerson = JsonCodec.schemaBasedBinaryCodec[Person](schemaPerson, JsonCodec.Config.default).streamDecoder
 
       personToProto = ProtobufCodec.protobufCodec[Person](schemaPerson).streamEncoder
       protoToPerson = ProtobufCodec.protobufCodec[Person](schemaPerson).streamDecoder
@@ -226,10 +228,16 @@ object DictionaryExample extends ZIOAppDefault {
       person     = Person("Mike", 32)
       dictionary = Map("m" -> person)
       dictionaryToJson = JsonCodec
-        .schemaBasedBinaryCodec[scala.collection.immutable.Map[String, Person]](schemaPersonDictionaryFromMacro)
+        .schemaBasedBinaryCodec[scala.collection.immutable.Map[String, Person]](
+          schemaPersonDictionaryFromMacro,
+          JsonCodec.Config.default
+        )
         .streamEncoder
       jsonToDictionary = JsonCodec
-        .schemaBasedBinaryCodec[scala.collection.immutable.Map[String, Person]](schemaPersonDictionaryFromMacro)
+        .schemaBasedBinaryCodec[scala.collection.immutable.Map[String, Person]](
+          schemaPersonDictionaryFromMacro,
+          JsonCodec.Config.default
+        )
         .streamDecoder
       newPersonDictionary <- ZStream(dictionary)
                               .via(dictionaryToJson)

diff --git a/zio-schema-examples/shared/src/main/scala/dev/zio/schema/example/example2/Example2.scala b/zio-schema-examples/shared/src/main/scala/dev/zio/schema/example/example2/Example2.scala
@@ -156,9 +156,11 @@ object JsonSample extends zio.ZIOAppDefault {
 
   override def run: ZIO[Environment with ZIOAppArgs, Any, Any] =
     for {
-      _                    <- ZIO.unit
-      person               = Person("Michelle", 32)
-      personToJsonPipeline = JsonCodec.schemaBasedBinaryCodec[Person](Person.schema).streamEncoder
+      _      <- ZIO.unit
+      person = Person("Michelle", 32)
+      personToJsonPipeline = JsonCodec
+        .schemaBasedBinaryCodec[Person](Person.schema, JsonCodec.Config.default)
+        .streamEncoder
       _ <- ZStream(person)
             .via(personToJsonPipeline)
             .via(ZPipeline.utf8Decode)
@@ -201,8 +203,8 @@ object CombiningExample extends zio.ZIOAppDefault {
       _      <- ZIO.debug("combining roundtrip")
       person = Person("Michelle", 32)
 
-      personToJson = JsonCodec.schemaBasedBinaryCodec[Person](Person.schema).streamEncoder
-      jsonToPerson = JsonCodec.schemaBasedBinaryCodec[Person](Person.schema).streamDecoder
+      personToJson = JsonCodec.schemaBasedBinaryCodec[Person](Person.schema, JsonCodec.Config.default).streamEncoder
+      jsonToPerson = JsonCodec.schemaBasedBinaryCodec[Person](Person.schema, JsonCodec.Config.default).streamDecoder
 
       personToProto = ProtobufCodec.protobufCodec[Person](Person.schema).streamEncoder
       protoToPerson = ProtobufCodec.protobufCodec[Person](Person.schema).streamDecoder

diff --git a/zio-schema-examples/shared/src/main/scala/dev/zio/schema/example/example3/Example3.scala b/zio-schema-examples/shared/src/main/scala/dev/zio/schema/example/example3/Example3.scala
@@ -73,16 +73,24 @@ object Example3 extends ZIOAppDefault {
     _      <- ZIO.debug("input JSON    : " + json)
 
     // get objects from JSON
-    personDTO <- ZIO.fromEither(JsonCodec.schemaBasedBinaryCodec[PersonDTO](PersonDTO.schema).decode(chunks))
-    person    <- ZIO.fromEither(JsonCodec.schemaBasedBinaryCodec[Person](personTransformation).decode(chunks))
-    _         <- ZIO.debug("PersonDTO     : " + personDTO)
-    _         <- ZIO.debug("Person        : " + person)
+    personDTO <- ZIO.fromEither(
+                  JsonCodec.schemaBasedBinaryCodec[PersonDTO](PersonDTO.schema, JsonCodec.Config.default).decode(chunks)
+                )
+    person <- ZIO.fromEither(
+               JsonCodec.schemaBasedBinaryCodec[Person](personTransformation, JsonCodec.Config.default).decode(chunks)
+             )
+    _ <- ZIO.debug("PersonDTO     : " + personDTO)
+    _ <- ZIO.debug("Person        : " + person)
 
     // get JSON from Objects
-    personJson    = new String(JsonCodec.schemaBasedBinaryCodec[Person](Person.schema).encode(person).toArray)
-    personDTOJson = new String(JsonCodec.schemaBasedBinaryCodec[Person](personTransformation).encode(person).toArray)
-    _             <- ZIO.debug("Person    JSON: " + personJson)
-    _             <- ZIO.debug("PersonDTO JSON: " + personDTOJson)
+    personJson = new String(
+      JsonCodec.schemaBasedBinaryCodec[Person](Person.schema, JsonCodec.Config.default).encode(person).toArray
+    )
+    personDTOJson = new String(
+      JsonCodec.schemaBasedBinaryCodec[Person](personTransformation, JsonCodec.Config.default).encode(person).toArray
+    )
+    _ <- ZIO.debug("Person    JSON: " + personJson)
+    _ <- ZIO.debug("PersonDTO JSON: " + personDTOJson)
 
   } yield ()
 }