Update zio-json to 0.7.0

plokhotnyuk · plokhotnyuk · commit 080b9ab845dd · 2024-06-04T21:16:28.000+02:00
diff --git a/build.sbt b/build.sbt
@@ -245,7 +245,7 @@ lazy val `jsoniter-scala-benchmark` = crossProject(JVMPlatform, JSPlatform)
     libraryDependencies ++= Seq(
       "io.spray" %% "spray-json" % "1.3.6",
       "org.playframework" %%% "play-json" % "3.0.3",
-      "dev.zio" %%% "zio-json" % "0.6.2",
+      "dev.zio" %%% "zio-json" % "0.7.0",
       "com.evolutiongaming" %%% "play-json-jsoniter" % "0.10.3",
       "com.lihaoyi" %%% "upickle" % "3.3.1",
       "io.circe" %%% "circe-generic" % "0.14.7",
diff --git a/jsoniter-scala-benchmark/shared/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/ArrayOfEnumADTsReading.scala b/jsoniter-scala-benchmark/shared/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/ArrayOfEnumADTsReading.scala
@@ -121,11 +121,9 @@ class ArrayOfEnumADTsReading extends ArrayOfEnumADTsBenchmark {
 
   @Benchmark
   def zioJson(): Array[SuitADT] = {
-    import com.github.plokhotnyuk.jsoniter_scala.benchmark.ZioJSONEncoderDecoders._
     import zio.json._
-    import zio.json.JsonDecoder._
     import java.nio.charset.StandardCharsets.UTF_8
 
-    new String(jsonBytes, UTF_8).fromJson[Array[SuitADT]].fold(sys.error, identity)
+    new String(jsonBytes, UTF_8).fromJson[Array[SuitADT]](ZioJSONEncoderDecoders.arrayOfEnumADTsC3c.decoder).fold(sys.error, identity)
   }
 }
diff --git a/jsoniter-scala-benchmark/shared/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/ArrayOfEnumADTsWriting.scala b/jsoniter-scala-benchmark/shared/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/ArrayOfEnumADTsWriting.scala
@@ -131,11 +131,9 @@ class ArrayOfEnumADTsWriting extends ArrayOfEnumADTsBenchmark {
 
   @Benchmark
   def zioJson(): Array[Byte] = {
-    import com.github.plokhotnyuk.jsoniter_scala.benchmark.ZioJSONEncoderDecoders._
     import zio.json._
-    import zio.json.JsonEncoder._
     import java.nio.charset.StandardCharsets.UTF_8
 
-    obj.toJson.getBytes(UTF_8)
+    obj.toJson(ZioJSONEncoderDecoders.arrayOfEnumADTsC3c.encoder).getBytes(UTF_8)
   }
 }
diff --git a/jsoniter-scala-benchmark/shared/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/ArrayOfEnumsReading.scala b/jsoniter-scala-benchmark/shared/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/ArrayOfEnumsReading.scala
@@ -115,11 +115,9 @@ class ArrayOfEnumsReading extends ArrayOfEnumsBenchmark {
 
   @Benchmark
   def zioJson(): Array[SuitEnum] = {
-    import com.github.plokhotnyuk.jsoniter_scala.benchmark.ZioJSONEncoderDecoders._
     import zio.json._
-    import zio.json.JsonDecoder._
     import java.nio.charset.StandardCharsets.UTF_8
 
-    new String(jsonBytes, UTF_8).fromJson[Array[SuitEnum]].fold(sys.error, identity)
+    new String(jsonBytes, UTF_8).fromJson[Array[SuitEnum]](ZioJSONEncoderDecoders.arrayOfEnumsC3c.decoder).fold(sys.error, identity)
   }
 }
diff --git a/jsoniter-scala-benchmark/shared/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/ArrayOfEnumsWriting.scala b/jsoniter-scala-benchmark/shared/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/benchmark/ArrayOfEnumsWriting.scala
@@ -124,11 +124,9 @@ class ArrayOfEnumsWriting extends ArrayOfEnumsBenchmark {
 
   @Benchmark
   def zioJson(): Array[Byte] = {
-    import com.github.plokhotnyuk.jsoniter_scala.benchmark.ZioJSONEncoderDecoders._
     import zio.json._
-    import zio.json.JsonEncoder._
     import java.nio.charset.StandardCharsets.UTF_8
 
-    obj.toJson.getBytes(UTF_8)
+    obj.toJson(ZioJSONEncoderDecoders.arrayOfEnumsC3c.encoder).getBytes(UTF_8)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -121,11 +121,9 @@ class ArrayOfEnumADTsReading extends ArrayOfEnumADTsBenchmark {`
`121`	`121`
`122`	`122`	`@Benchmark`
`123`	`123`	`def zioJson(): Array[SuitADT] = {`
`124`		`- import com.github.plokhotnyuk.jsoniter_scala.benchmark.ZioJSONEncoderDecoders._`
`125`	`124`	`import zio.json._`
`126`		`- import zio.json.JsonDecoder._`
`127`	`125`	`import java.nio.charset.StandardCharsets.UTF_8`
`128`	`126`
`129`		`- new String(jsonBytes, UTF_8).fromJson[Array[SuitADT]].fold(sys.error, identity)`
	`127`	`+ new String(jsonBytes, UTF_8).fromJson[Array[SuitADT]](ZioJSONEncoderDecoders.arrayOfEnumADTsC3c.decoder).fold(sys.error, identity)`
`130`	`128`	`}`
`131`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,11 +131,9 @@ class ArrayOfEnumADTsWriting extends ArrayOfEnumADTsBenchmark {`
`131`	`131`
`132`	`132`	`@Benchmark`
`133`	`133`	`def zioJson(): Array[Byte] = {`
`134`		`- import com.github.plokhotnyuk.jsoniter_scala.benchmark.ZioJSONEncoderDecoders._`
`135`	`134`	`import zio.json._`
`136`		`- import zio.json.JsonEncoder._`
`137`	`135`	`import java.nio.charset.StandardCharsets.UTF_8`
`138`	`136`
`139`		`- obj.toJson.getBytes(UTF_8)`
	`137`	`+ obj.toJson(ZioJSONEncoderDecoders.arrayOfEnumADTsC3c.encoder).getBytes(UTF_8)`
`140`	`138`	`}`
`141`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,11 +115,9 @@ class ArrayOfEnumsReading extends ArrayOfEnumsBenchmark {`
`115`	`115`
`116`	`116`	`@Benchmark`
`117`	`117`	`def zioJson(): Array[SuitEnum] = {`
`118`		`- import com.github.plokhotnyuk.jsoniter_scala.benchmark.ZioJSONEncoderDecoders._`
`119`	`118`	`import zio.json._`
`120`		`- import zio.json.JsonDecoder._`
`121`	`119`	`import java.nio.charset.StandardCharsets.UTF_8`
`122`	`120`
`123`		`- new String(jsonBytes, UTF_8).fromJson[Array[SuitEnum]].fold(sys.error, identity)`
	`121`	`+ new String(jsonBytes, UTF_8).fromJson[Array[SuitEnum]](ZioJSONEncoderDecoders.arrayOfEnumsC3c.decoder).fold(sys.error, identity)`
`124`	`122`	`}`
`125`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,11 +124,9 @@ class ArrayOfEnumsWriting extends ArrayOfEnumsBenchmark {`
`124`	`124`
`125`	`125`	`@Benchmark`
`126`	`126`	`def zioJson(): Array[Byte] = {`
`127`		`- import com.github.plokhotnyuk.jsoniter_scala.benchmark.ZioJSONEncoderDecoders._`
`128`	`127`	`import zio.json._`
`129`		`- import zio.json.JsonEncoder._`
`130`	`128`	`import java.nio.charset.StandardCharsets.UTF_8`
`131`	`129`
`132`		`- obj.toJson.getBytes(UTF_8)`
	`130`	`+ obj.toJson(ZioJSONEncoderDecoders.arrayOfEnumsC3c.encoder).getBytes(UTF_8)`
`133`	`131`	`}`
`134`	`132`	`}`