SCALA-400 make Command ADT more complex

Author: Matteo Di Pirro

zio-2/src/main/scala/com/baeldung/scala/zio/json/BaeldungZIOJson.scala

@@ -5,11 +5,13 @@ import zio.json.*
 sealed trait Command
 case class Start(timeout: Long) extends Command
 case object Stop extends Command
+case class Kill(reason: String, force: Boolean) extends Command
 
 @jsonDiscriminator("type")
 sealed trait Command2
 case class Start2(timeout: Long) extends Command2
 case object Stop2 extends Command2
+case class Kill2(reason: String, force: Boolean) extends Command2
 
 object Start {
   implicit val encoder: JsonEncoder[Start] = DeriveJsonEncoder.gen[Start]

zio-2/src/test/scala/com/baeldung/scala/zio/json/DecodingSpec.scala

@@ -25,6 +25,10 @@ class DecodingSpec extends AnyWordSpec with Matchers {
         Start(100)
       )
       """{"Stop":{}}""".fromJson[Command] shouldBe Right(Stop)
+      """{"Kill":{"reason":"Random reason","force":false}}"""
+        .fromJson[Command] shouldBe Right(
+        Kill("Random reason", false)
+      )
     }
 
     "decode Stop to JSON" in {
@@ -35,13 +39,21 @@ class DecodingSpec extends AnyWordSpec with Matchers {
         Start(100)
       )
       """"Stop"""".fromJson[Stop.type] shouldBe Right(Stop)
+      """{"Kill":{"reason":"Random reason","force":false}}"""
+        .fromJson[Command] shouldBe Right(
+        Kill("Random reason", false)
+      )
     }
 
     "use a discriminator" in {
       """{"type":"Start2","timeout":100}""".fromJson[Command2] shouldBe Right(
         Start2(100)
       )
       """{"type":"Stop2"}""".fromJson[Command2] shouldBe Right(Stop2)
+      """{"type":"Kill2","reason":"Random reason","force":false}"""
+        .fromJson[Command2] shouldBe Right(
+        Kill2("Random reason", false)
+      )
     }
 
     "fail if there's no discriminator" in {

zio-2/src/test/scala/com/baeldung/scala/zio/json/EncodingSpec.scala

@@ -13,6 +13,10 @@ class EncodingSpec extends AnyWordSpec with Matchers {
     "encode an ADT to JSON" in {
       (Start(100): Command).toJson shouldBe """{"Start":{"timeout":100}}"""
       (Stop: Command).toJson shouldBe """{"Stop":{}}"""
+      (Kill(
+        reason = "Random reason",
+        force = false
+      ): Command).toJson shouldBe """{"Kill":{"reason":"Random reason","force":false}}"""
     }
 
     "encode Stop to JSON" in {
@@ -21,13 +25,21 @@ class EncodingSpec extends AnyWordSpec with Matchers {
 
       (Start(100): Command).toJson shouldBe """{"Start":{"timeout":100}}"""
       Stop.toJson shouldBe """"Stop""""
+      (Kill(
+        reason = "Random reason",
+        force = false
+      ): Command).toJson shouldBe """{"Kill":{"reason":"Random reason","force":false}}"""
     }
 
     "use a discriminator" in {
       (Start2(
         100
       ): Command2).toJson shouldBe """{"type":"Start2","timeout":100}"""
       (Stop2: Command2).toJson shouldBe """{"type":"Stop2"}"""
+      (Kill2(
+        reason = "Random reason",
+        force = false
+      ): Command2).toJson shouldBe """{"type":"Kill2","reason":"Random reason","force":false}"""
     }
   }
 }