Clean up of benchmarks

Author: plokhotnyuk

jsoniter-scala-benchmark/shared/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/BorerJsonEncodersDecoders.scala

@@ -6,7 +6,6 @@ import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 import com.github.plokhotnyuk.jsoniter_scala.benchmark.SuitEnum.SuitEnum
 import io.bullet.borer.{AdtEncodingStrategy, Codec, Decoder, Encoder, Reader, Writer}
-import io.bullet.borer.Borer.Error._
 import io.bullet.borer.Json.DecodingConfig
 import io.bullet.borer.derivation.ArrayBasedCodecs
 import io.bullet.borer.derivation.MapBasedCodecs._

jsoniter-scala-benchmark/shared/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/CirceEncodersDecoders.scala

@@ -7,13 +7,12 @@ import io.circe.Encoder._
 import io.circe._
 import io.circe.generic.semiauto._
 import io.circe.syntax._
-
 import java.time.Instant
 import java.util.Base64
 import java.util.concurrent.ConcurrentHashMap
 import scala.collection.immutable.{BitSet, IntMap, Map}
 import scala.collection.mutable
-import scala.util.Try
+import scala.util.control.NonFatal
 
 object CirceEncodersDecoders {
   val printer: Printer = Printer.noSpaces.copy(dropNullValues = true, reuseWriters = true, predictSize = true)
@@ -755,7 +754,11 @@ object CirceEncodersDecoders {
   implicit val missingRequiredFieldsC3c: Codec[MissingRequiredFields] = deriveCodec
   implicit val nestedStructsC3c: Codec[NestedStructs] = deriveCodec
   implicit val suitC3c: Codec[Suit] =
-    Codec.from(decodeString.emap(s => Try(Suit.valueOf(s)).fold[Either[String, Suit]](_ => Left("Suit"), Right.apply)),
+    Codec.from(decodeString.emap(s => {
+      try new Right(Suit.valueOf(s)) catch {
+        case NonFatal(_) => new Left("Suit")
+      }
+    }),
       encodeString.contramap[Suit](_.name))
   implicit val suitADTC3c: Codec[SuitADT] = Codec.from(decodeString.map {
     val m = Map(
@@ -765,16 +768,19 @@ object CirceEncodersDecoders {
       "Clubs" -> Clubs)
     s => m.getOrElse(s, throw new IllegalArgumentException("SuitADT"))
   }, encodeString.contramap(_.toString))
-  implicit val suitEnumC3c: Codec[SuitEnum] = Codec.from(decodeString.emapTry {
+  implicit val suitEnumC3c: Codec[SuitEnum] = Codec.from(decodeString.emap {
     val m = new ConcurrentHashMap[String, SuitEnum]
-    s => Try {
-      var v = m.get(s)
-      if (v eq null) {
-        v = SuitEnum.values.iterator.find(_.toString == s).getOrElse(throw new IllegalArgumentException("SuitEnum"))
-        m.put(s, v)
+    s =>
+      try {
+        var v = m.get(s)
+        if (v eq null) {
+          v = SuitEnum.values.iterator.find(_.toString == s).getOrElse(throw new IllegalArgumentException("SuitEnum"))
+          m.put(s, v)
+        }
+        new Right(v)
+      } catch {
+        case NonFatal(_) => new Left("SuitEnum")
       }
-      v
-    }
   }, encodeString.contramap(_.toString))
   implicit val primitivesC3c: Codec[Primitives] = deriveCodec
   implicit val tweetC3c: Codec[TwitterAPI.Tweet] = {

jsoniter-scala-benchmark/shared/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/Json4sFormats.scala

@@ -47,37 +47,37 @@ object AnyValsJson4sFormats {
     new CustomSerializer[ByteVal](_ => ({
       case JInt(x) if x.isValidByte => new ByteVal(x.toByte)
     }, {
-      case x: ByteVal => JInt(BigInt(x.a))
+      case x: ByteVal => new JLong(x.a.toLong)
     })) +
     new CustomSerializer[ShortVal](_ => ({
       case JInt(x) if x.isValidShort => new ShortVal(x.toShort)
     }, {
-      case x: ShortVal => JInt(BigInt(x.a))
+      case x: ShortVal => new JLong(x.a.toLong)
     })) +
     new CustomSerializer[IntVal](_ => ({
       case JInt(x) if x.isValidInt => new IntVal(x.toInt)
     }, {
-      case x: IntVal => JInt(x.a)
+      case x: IntVal => new JLong(x.a.toLong)
     })) +
     new CustomSerializer[LongVal](_ => ({
-      case JInt(x) if x.isValidLong => new LongVal(x.toInt)
+      case JInt(x) if x.isValidLong => new LongVal(x.toLong)
     }, {
-      case x: LongVal => JInt(x.a)
+      case x: LongVal => new JLong(x.a)
     })) +
     new CustomSerializer[FloatVal](_ => ({
       case JDecimal(x) => new FloatVal(x.toFloat)
     }, {
-      case x: FloatVal => JDecimal(BigDecimal(x.a))
+      case x: FloatVal => new JDecimal(BigDecimal(x.a))
     })) +
     new CustomSerializer[DoubleVal](_ => ({
-      case JDouble(x) => new DoubleVal(x.toFloat)
+      case JDouble(x) => new DoubleVal(x)
     }, {
-      case x: DoubleVal => JDecimal(x.a)
+      case x: DoubleVal => new JDecimal(x.a)
     })) +
     new CustomSerializer[CharVal](_ => ({
       case JString(x) if x.length == 1 => new CharVal(x.charAt(0))
     }, {
-      case x: CharVal => JString(x.a.toString)
+      case x: CharVal => new JString(x.a.toString)
     }))
 }
 
@@ -106,10 +106,10 @@ object GeoJsonJson4sFormats {
         classOf[GeoJSON.MultiLineString], classOf[GeoJSON.Polygon], classOf[GeoJSON.MultiPolygon],
         classOf[GeoJSON.GeometryCollection], classOf[GeoJSON.Feature], classOf[GeoJSON.FeatureCollection]))
   } +
-    new CustomSerializer[Tuple2[Double, Double]](_ => ({
+    new CustomSerializer[(Double, Double)](_ => ({
       case JArray(JDouble(x) :: JDouble(y) :: Nil) => new Tuple2[Double, Double](x, y)
     }, {
-      case (x: Double, y: Double) => JArray(JDouble(x) :: JDouble(y) :: Nil)
+      case (x: Double, y: Double) => new JArray(new JDouble(x) :: new JDouble(y) :: Nil)
     }))
 }