Clean up of benchmarks

Author: plokhotnyuk

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

@@ -110,15 +110,10 @@ class SuiteEnumSerializer extends JsonSerializer[SuitEnum] {
 }
 
 class SuiteEnumDeserializer extends JsonDeserializer[SuitEnum] {
-  override def deserialize(jp: JsonParser, ctxt: DeserializationContext): SuitEnum = {
-    val s = jp.getValueAsString
-    var x: SuitEnum = null
-    try x = SuitEnum.withName(s) catch {
-      case _: NoSuchElementException =>
+  override def deserialize(jp: JsonParser, ctxt: DeserializationContext): SuitEnum =
+    try SuitEnum.withName(jp.getValueAsString) catch {
+      case _: NoSuchElementException => ctxt.handleUnexpectedToken(classOf[SuitEnum], jp).asInstanceOf[SuitEnum]
     }
-    if (x eq null) ctxt.handleUnexpectedToken(classOf[SuitEnum], jp)
-    x
-  }
 }
 
 class SuitADTSerializer extends JsonSerializer[SuitADT] {

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

@@ -222,18 +222,14 @@ object SprayFormats extends DefaultJsonProtocol {
     s => suite.getOrElse(s, throw new IllegalArgumentException("SuitADT"))
   }
   implicit val suitEnumJsonFormat: RootJsonFormat[SuitEnum.SuitEnum] = new RootJsonFormat[SuitEnum.SuitEnum] {
-    override def read(json: JsValue): SuitEnum.SuitEnum = {
-      var x: SuitEnum.SuitEnum = null
+    override def read(json: JsValue): SuitEnum.SuitEnum =
       json match {
         case js: JsString =>
-          try x = SuitEnum.withName(js.value) catch {
-            case _: NoSuchElementException =>
+          try SuitEnum.withName(js.value) catch {
+            case _: NoSuchElementException => deserializationError("Expected JSON string of value from SuitEnum")
           }
-        case _ =>
+        case _ => deserializationError("Expected JSON string of value from SuitEnum")
       }
-      if (x eq null) deserializationError(s"Expected JSON string of value from SuitEnum")
-      x
-    }
 
     override def write(ev: SuitEnum.SuitEnum): JsValue = new JsString(ev.toString)
   }