More benchmarks for Jackson + clean up of benchmark code

Author: plokhotnyuk

benchmark/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/macros/ArrayOfDoublesBenchmark.scala

@@ -40,7 +40,7 @@ class ArrayOfDoublesBenchmark extends CommonParams {
 
   @Benchmark
   def writeJsoniterScalaPrealloc(): Int = writeToPreallocatedArray(obj, preallocatedBuf, 0)
-/* FIXME: Play serializes doubles in different format than toString: 0.0 as 0, 7.0687002407403325E18 as 7068700240740332500
+/* FIXME: Play serializes doubles in BigDecimal format: 0.0 as 0, 7.0687002407403325E18 as 7068700240740332500
   @Benchmark
   def writePlayJson(): Array[Byte] = Json.toBytes(Json.toJson(obj))
 */

benchmark/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/macros/ArrayOfEnumsBenchmark.scala

@@ -4,7 +4,7 @@ import java.nio.charset.StandardCharsets._
 
 import com.github.plokhotnyuk.jsoniter_scala.core._
 import com.github.plokhotnyuk.jsoniter_scala.macros.CirceEncodersDecoders._
-//import com.github.plokhotnyuk.jsoniter_scala.macros.JacksonSerDesers._
+import com.github.plokhotnyuk.jsoniter_scala.macros.JacksonSerDesers._
 import com.github.plokhotnyuk.jsoniter_scala.macros.JsoniterCodecs._
 import com.github.plokhotnyuk.jsoniter_scala.macros.PlayJsonFormats.enumArrayFormat
 import com.github.plokhotnyuk.jsoniter_scala.macros.SuitEnum.SuitEnum
@@ -29,10 +29,10 @@ class ArrayOfEnumsBenchmark extends CommonParams {
 
   @Benchmark
   def readCirce(): Array[SuitEnum] = decode[Array[SuitEnum]](new String(jsonBytes, UTF_8)).fold(throw _, x => x)
-/* FIXME jackson-module-scala cannot parse string representation of enum values
+
   @Benchmark
   def readJacksonScala(): Array[SuitEnum] = jacksonMapper.readValue[Array[SuitEnum]](jsonBytes)
-*/
+
   @Benchmark
   def readJsoniterScala(): Array[SuitEnum] = readFromArray[Array[SuitEnum]](jsonBytes)
 
@@ -41,10 +41,10 @@ class ArrayOfEnumsBenchmark extends CommonParams {
 
   @Benchmark
   def writeCirce(): Array[Byte] = printer.pretty(obj.asJson).getBytes(UTF_8)
-/* FIXME jackson-module-scala store array of objects with "enumClass" field instead of strings
+
   @Benchmark
   def writeJacksonScala(): Array[Byte] = jacksonMapper.writeValueAsBytes(obj)
-*/
+
   @Benchmark
   def writeJsoniterScala(): Array[Byte] = writeToArray(obj)
 

benchmark/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/macros/ArrayOfFloatsBenchmark.scala

@@ -40,7 +40,7 @@ class ArrayOfFloatsBenchmark extends CommonParams {
 
   @Benchmark
   def writeJsoniterScalaPrealloc(): Int = writeToPreallocatedArray(obj, preallocatedBuf, 0)
-/* FIXME: Play-JSON serialize double values instead of float
+/* FIXME: Play-JSON serialize BigDecimal values instead of float
   @Benchmark
   def writePlayJson(): Array[Byte] = Json.toBytes(Json.toJson(obj))
 */

benchmark/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/macros/ArrayOfZonedDateTimesBenchmark.scala

@@ -37,10 +37,10 @@ class ArrayOfZonedDateTimesBenchmark extends CommonParams {
 
   @Benchmark
   def writeCirce(): Array[Byte] = printer.pretty(obj.asJson).getBytes(UTF_8)
-/* FIXME jackson serializes ZonedDateTime without IANA region
+
   @Benchmark
   def writeJacksonScala(): Array[Byte] = jacksonMapper.writeValueAsBytes(obj)
-*/
+
   @Benchmark
   def writeJsoniterScala(): Array[Byte] = writeToArray(obj)
 

benchmark/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/macros/CirceEncodersDecoders.scala

@@ -26,6 +26,6 @@ object CirceEncodersDecoders {
   }
   implicit val zoneOffsetEncoder: Encoder[ZoneOffset] = Encoder.encodeString.contramap[ZoneOffset](_.toString)
   implicit val zoneOffsetDecoder: Decoder[ZoneOffset] = Decoder.decodeString.emap { str =>
-    Either.catchNonFatal(ZoneOffset.of(str)).leftMap(t => "Suit")
+    Either.catchNonFatal(ZoneOffset.of(str)).leftMap(t => "ZoneOffset")
   }
 }

benchmark/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/macros/JacksonSerDesers.scala

@@ -3,7 +3,7 @@ package com.github.plokhotnyuk.jsoniter_scala.macros
 import com.fasterxml.jackson.annotation.JsonInclude.Include
 import com.fasterxml.jackson.core.JsonToken._
 import com.fasterxml.jackson.core.`type`.TypeReference
-import com.fasterxml.jackson.core.{JsonFactory, JsonGenerator, JsonParser, JsonParseException => ParseException}
+import com.fasterxml.jackson.core.{JsonFactory, JsonGenerator, JsonParser, JsonToken, JsonParseException => ParseException}
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer
 import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.databind.ser.std.StdSerializer
@@ -12,6 +12,7 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.module.afterburner.AfterburnerModule
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import com.fasterxml.jackson.module.scala.experimental.ScalaObjectMapper
+import com.github.plokhotnyuk.jsoniter_scala.macros.SuitEnum.SuitEnum
 
 import scala.collection.immutable.{BitSet, HashMap, Map}
 import scala.collection.mutable
@@ -25,13 +26,16 @@ object JacksonSerDesers {
       .addSerializer(classOf[BitSet], new BitSetSerializer)
       .addSerializer(classOf[mutable.BitSet], new MutableBitSetSerializer)
       .addSerializer(classOf[Array[Byte]], new ByteArraySerializer)
+      .addSerializer(classOf[SuitEnum], new SuitEnumSerializer)
       .addDeserializer(classOf[BitSet], new BitSetDeserializer)
-      .addDeserializer(classOf[mutable.BitSet], new MutableBitSetDeserializer))
+      .addDeserializer(classOf[mutable.BitSet], new MutableBitSetDeserializer)
+      .addDeserializer(classOf[SuitEnum], new SuitEnumDeserializer))
     registerModule(new JavaTimeModule())
     registerModule(new AfterburnerModule)
     configure(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE, false)
     configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
     configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
+    configure(SerializationFeature.WRITE_DATES_WITH_ZONE_ID, true)
     configure(JsonParser.Feature.ALLOW_UNQUOTED_CONTROL_CHARS, true)
     setSerializationInclusion(Include.NON_EMPTY)
   }
@@ -119,3 +123,16 @@ class CustomMutableMapDeserializer extends
   override def getNullValue(ctxt: DeserializationContext): mutable.Map[Int, mutable.OpenHashMap[Long, Double]] =
     mutable.Map.empty
 }
+
+class SuitEnumSerializer extends JsonSerializer[SuitEnum] {
+  override def serialize(value: SuitEnum, jgen: JsonGenerator, provider: SerializerProvider): Unit =
+    jgen.writeString(value.toString)
+}
+
+class SuitEnumDeserializer extends JsonDeserializer[SuitEnum] {
+  override def deserialize(jp: JsonParser, ctxt: DeserializationContext): SuitEnum =
+    jp.getCurrentToken match {
+      case JsonToken.VALUE_STRING => SuitEnum.withName(jp.getValueAsString)
+      case _ => ctxt.handleUnexpectedToken(classOf[SuitEnum], jp).asInstanceOf[SuitEnum]
+    }
+}

benchmark/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/macros/ArrayOfEnumsBenchmarkSpec.scala

@@ -6,15 +6,13 @@ class ArrayOfEnumsBenchmarkSpec extends BenchmarkSpecBase {
   "ArrayOfEnumsBenchmark" should {
     "deserialize properly" in {
       benchmark.readCirce().deep shouldBe benchmark.obj.deep
-      //FIXME jackson-module-scala cannot parse string representation of enum values
-      //benchmark.readJacksonScala().deep shouldBe benchmark.obj.deep
+      benchmark.readJacksonScala().deep shouldBe benchmark.obj.deep
       benchmark.readJsoniterScala().deep shouldBe benchmark.obj.deep
       benchmark.readPlayJson().deep shouldBe benchmark.obj.deep
     }
     "serialize properly" in {
       toString(benchmark.writeCirce()) shouldBe benchmark.jsonString
-      //FIXME jackson-module-scala store array of objects with "enumClass" field instead of strings
-      //toString(benchmark.writeJacksonScala()) shouldBe benchmark.jsonString
+      toString(benchmark.writeJacksonScala()) shouldBe benchmark.jsonString
       toString(benchmark.writeJsoniterScala()) shouldBe benchmark.jsonString
       toString(benchmark.preallocatedBuf, benchmark.writeJsoniterScalaPrealloc()) shouldBe benchmark.jsonString
       toString(benchmark.writePlayJson()) shouldBe benchmark.jsonString

benchmark/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/macros/ArrayOfZonedDateTimesBenchmarkSpec.scala

@@ -12,8 +12,7 @@ class ArrayOfZonedDateTimesBenchmarkSpec extends BenchmarkSpecBase {
     }
     "serialize properly" in {
       toString(benchmark.writeCirce()) shouldBe benchmark.jsonString
-      //FIXME jackson serializes ZonedDateTime without IANA region
-      //toString(benchmark.writeJacksonScala()) shouldBe benchmark.jsonString
+      toString(benchmark.writeJacksonScala()) shouldBe benchmark.jsonString
       toString(benchmark.writeJsoniterScala()) shouldBe benchmark.jsonString
       toString(benchmark.preallocatedBuf, benchmark.writeJsoniterScalaPrealloc()) shouldBe benchmark.jsonString
       toString(benchmark.writePlayJson()) shouldBe benchmark.jsonString