Fix #78 & fix #79 & fix #80 by refactoring of low-level API of the reader + fix of code generation for options

Author: plokhotnyuk

core/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala

@@ -472,11 +472,10 @@ final class JsonReader private[jsoniter_scala](
     x
   }
 
-  def readNullOrError[A](default: A): A = parseNullOrError(default, "expected null", head)
-
-  def readNullOrNumberError[A](default: A, pos: Int): A =
-    if (default == null) numberError(pos - 1)
-    else parseNullOrError(default, "expected number or null", pos)
+  def readNullOrError[A](default: A, msg: String): A =
+    if (default == null) throw new IllegalArgumentException("'default' should not be null")
+    else if (isCurrentToken('n', head)) parseNullOrError(default, msg, head)
+    else decodeError(msg)
 
   def readNullOrTokenError[A](default: A, b: Byte): A =
     if (default == null) tokenError(b)
@@ -1262,6 +1261,10 @@ final class JsonReader private[jsoniter_scala](
       case ex: NumberFormatException => decodeError("illegal number", head - 1, ex)
     }
 
+  private def readNullOrNumberError[A](default: A, pos: Int): A =
+    if (default == null) numberError(pos - 1)
+    else parseNullOrError(default, "expected number or null", pos)
+
   private def numberError(pos: Int): Nothing = decodeError("illegal number", pos)
 
   private def leadingZeroError(pos: Int): Nothing = decodeError("illegal number with leading zero", pos)

macros/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMaker.scala

@@ -481,7 +481,7 @@ object JsonCodecMaker {
           q"new $tpe(${genReadVal(tpe1, nullValue(tpe1), isStringified)})"
         } else if (tpe <:< typeOf[Option[_]]) withDecoderFor(methodKey, default) {
           val tpe1 = typeArg1(tpe)
-          q"""if (in.isNextToken('n')) in.readNullOrError(None)
+          q"""if (in.isNextToken('n')) in.readNullOrError(default, "expected value or null")
               else {
                 in.rollbackToken()
                 Some(${genReadVal(tpe1, nullValue(tpe1), isStringified)})

macros/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMakerSpec.scala

@@ -491,6 +491,12 @@ class JsonCodecMakerSpec extends WordSpec with Matchers {
       verifySerDeser(codecOfStringifiedOption, Some(BigInt(123)), "\"123\"".getBytes)
       verifySerDeser(codecOfStringifiedOption, None, "null".getBytes)
     }
+    "throw parse exception in case of unexpected value for option" in {
+      val codecOfStringOption = make[Option[String]](CodecMakerConfig())
+      assert(intercept[JsonParseException] {
+        verifyDeser(codecOfStringOption, Option("VVV"), """no!!!""".getBytes)
+      }.getMessage.contains("expected value or null, offset: 0x00000001"))
+    }
     "serialize and deserialize case classes with tuples" in {
       verifySerDeser(codecOfTuples, Tuples((1, 2.2, List('V')), ("VVV", 3, Some(LocationType.GPS))),
         """{"t1":[1,2.2,["V"]],"t2":["VVV",3,"GPS"]}""".getBytes)
@@ -782,9 +788,9 @@ class JsonCodecMakerSpec extends WordSpec with Matchers {
       parsedObj.oc shouldBe defaults.oc
       parsedObj.a.deep shouldBe defaults.a.deep
     }
-    "deserialize values of mutable collections in case of null defaults are defined" in {
-      val json = """{"ml":{"1":1},"mm":{"2":2},"ms":[3],"mb":[4]}""".getBytes
-      val parsedObj = read(json)(codecOfDefaults)
+    "deserialize default values in case of missing field or null/empty values" in {
+      read("""{}""".getBytes)(codecOfDefaults)
+      read("""{"s":null,"bi":null,"l":[],"oc":null,"a":null}""".getBytes)(codecOfDefaults)
     }
     "don't serialize and deserialize transient and non constructor defined fields of case classes" in {
       verifySerDeser(make[Transient](CodecMakerConfig()), Transient(required = "VVV"), """{"required":"VVV"}""".getBytes)

project/plugins.sbt

@@ -3,7 +3,5 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.7")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.3")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
-addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.4")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.18")
-addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0")
 addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full) // required for circe benchmark

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "0.15.1-SNAPSHOT"
+version in ThisBuild := "0.16.0-SNAPSHOT"