fixup

Author: gaeljw

play-json/jvm/src/main/scala/play/api/libs/json/jackson/JacksonJson.scala

@@ -82,18 +82,22 @@ private[jackson] class JsValueSerializer(jsonConfig: JsonConfig) extends ValueSe
           val va = v.abs
           va <= jsonConfig.bigDecimalSerializerConfig.maxPlain && va >= jsonConfig.bigDecimalSerializerConfig.minPlain
         }
-        val stripped = stripTrailingZeros(v.bigDecimal)
-        val raw      = if (shouldWritePlain) stripped.toPlainString else stripped.toString
-
-        if (raw.exists(c => c == 'E' || c == '.'))
-          json.writeNumber(raw)
-        else
-          json match {
-            case tb: TokenBuffer =>
-              tb.writeNumber(raw, true)
-            case _ =>
-              json.writeNumber(raw)
-          }
+        val stripped               = stripTrailingZeros(v.bigDecimal)
+        val (raw, rawAsBigDecimal) = if (shouldWritePlain) {
+          val str = stripped.toPlainString
+          (str, new JBigDec(str))
+        } else {
+          (stripped.toString, stripped)
+        }
+
+        json match {
+          case tb: TokenBuffer =>
+            // If the JsonGenerator is a TokenBuffer, use its writeNumber specific method
+            val isInteger = raw.forall(c => c != 'E' && c != '.')
+            tb.writeNumber(raw, isInteger)
+          case _ =>
+            json.writeNumber(rawAsBigDecimal)
+        }
       }
 
       case JsString(v)  => json.writeString(v)

play-json/jvm/src/test/scala/play/api/libs/json/JsonSpec.scala

@@ -10,12 +10,12 @@ import java.math.BigInteger
 import java.util.Calendar
 import java.util.Date
 import java.util.TimeZone
-
 import tools.jackson.databind.JsonNode
 import tools.jackson.databind.ObjectMapper
 import play.api.libs.functional.syntax._
 import play.api.libs.json.Json._
 import play.api.libs.json.jackson.JacksonJson
+import tools.jackson.databind.node.{ ArrayNode, BigIntegerNode, DoubleNode, NumericNode, ObjectNode }
 
 class JsonSpec extends org.specs2.mutable.Specification {
 
@@ -469,36 +469,47 @@ class JsonSpec extends org.specs2.mutable.Specification {
     }
 
     "Serialize and deserialize Jackson ObjectNodes" in {
-      val on = mapper
+      val on: ObjectNode = mapper
         .createObjectNode()
         .put("foo", 1)
         .put("bar", "two")
-      val json = Json.obj("foo" -> 1, "bar" -> "two")
-
+      val json                             = Json.obj("foo" -> 1, "bar" -> "two")
+      val deserialized: JsResult[JsonNode] = fromJson[JsonNode](json)
       toJson(on).must_==(json) and (
-        fromJson[JsonNode](json).map(_.toString).must_==(JsSuccess(on.toString))
+        deserialized.map(_.isInstanceOf[ObjectNode]).must_==(JsSuccess(true))
+      ) and (
+        deserialized.map(_.toString).must_==(JsSuccess(on.toString))
       )
     }
 
     "Serialize and deserialize Jackson ArrayNodes" in {
-      val an = mapper
+      val an: ArrayNode = mapper
         .createArrayNode()
         .add("one")
         .add(2)
-      val json = Json.arr("one", 2)
+      val json                             = Json.arr("one", 2)
+      val deserialized: JsResult[JsonNode] = fromJson[JsonNode](json)
       toJson(an).must(equalTo(json)) and (
-        fromJson[JsonNode](json).map(_.toString).must_==(JsSuccess(an.toString))
+        deserialized.map(_.isInstanceOf[ArrayNode]).must_==(JsSuccess(true))
+      ) and (
+        deserialized.map(_.toString).must_==(JsSuccess(an.toString))
       )
     }
 
     "Deserialize integer JsNumber as Jackson number node" in {
-      val jsNum = JsNumber(new java.math.BigDecimal("50"))
-      fromJson[JsonNode](jsNum).map(_.toString).must_==(JsSuccess("50"))
+      val jsNum                            = JsNumber(new java.math.BigDecimal("50"))
+      val deserialized: JsResult[JsonNode] = fromJson[JsonNode](jsNum)
+      deserialized.map(_.isInstanceOf[NumericNode]).must_==(JsSuccess(true)) and (
+        deserialized.map(_.toString).must_==(JsSuccess("50"))
+      )
     }
 
     "Deserialize float JsNumber as Jackson number node" in {
-      val jsNum = JsNumber(new java.math.BigDecimal("12.345"))
-      fromJson[JsonNode](jsNum).map(_.toString).must_==(JsSuccess("12.345"))
+      val jsNum                            = JsNumber(new java.math.BigDecimal("12.345"))
+      val deserialized: JsResult[JsonNode] = fromJson[JsonNode](jsNum)
+      deserialized.map(_.isInstanceOf[NumericNode]).must_==(JsSuccess(true)) and (
+        deserialized.map(_.toString).must_==(JsSuccess("12.345"))
+      )
     }
 
     "Serialize JsNumbers with integers correctly" in {