fixup formatting + test troubleshooting

Author: gaeljw

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

@@ -15,8 +15,8 @@ import scala.collection.mutable.ArrayBuffer
 import scala.collection.mutable.ListBuffer
 
 import com.fasterxml.jackson.annotation.JsonFormat
-import tools.jackson.core.{JsonGenerator, JsonParser, JsonTokenId, Version}
-import tools.jackson.core.json.{JsonFactory, JsonWriteFeature}
+import tools.jackson.core.{ JsonGenerator, JsonParser, JsonTokenId, Version }
+import tools.jackson.core.json.{ JsonFactory, JsonWriteFeature }
 import tools.jackson.databind.JacksonModule.SetupContext
 import tools.jackson.databind._
 import tools.jackson.databind.`type`.TypeFactory
@@ -245,20 +245,29 @@ private[jackson] class JsValueDeserializer(factory: TypeFactory, klass: Class[?]
 }
 
 private[jackson] class PlayDeserializers(jsonSettings: JsonConfig) extends Deserializers.Base {
-  override def findBeanDeserializer(javaType: JavaType, config: DeserializationConfig, beanDescRef: BeanDescription.Supplier) = {
+  override def findBeanDeserializer(
+      javaType: JavaType,
+      config: DeserializationConfig,
+      beanDescRef: BeanDescription.Supplier
+  ) = {
     val klass = javaType.getRawClass
     if (classOf[JsValue].isAssignableFrom(klass) || klass == JsNull.getClass) {
       new JsValueDeserializer(config.getTypeFactory, klass, jsonSettings)
     } else null
   }
 
-  override def hasDeserializerFor(config: DeserializationConfig, valueType: Class[_]): Boolean = {
+  override def hasDeserializerFor(config: DeserializationConfig, valueType: Class[?]): Boolean = {
     classOf[JsValue].isAssignableFrom(valueType) || valueType == JsNull.getClass
   }
 }
 
 private[jackson] class PlaySerializers(jsonSettings: JsonConfig) extends Serializers.Base {
-  override def findSerializer(config: SerializationConfig, javaType: JavaType, beanDescRef: BeanDescription.Supplier, formatOverrides: JsonFormat.Value) = {
+  override def findSerializer(
+      config: SerializationConfig,
+      javaType: JavaType,
+      beanDescRef: BeanDescription.Supplier,
+      formatOverrides: JsonFormat.Value
+  ) = {
     val ser: Object = if (classOf[JsValue].isAssignableFrom(beanDescRef.getBeanClass)) {
       new JsValueSerializer(jsonSettings)
     } else {

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

@@ -498,8 +498,7 @@ class JsonSpec extends org.specs2.mutable.Specification {
 
     "Deserialize float JsNumber as Jackson number node" in {
       val jsNum = JsNumber(new java.math.BigDecimal("12.345"))
-        val x = fromJson[JsonNode](jsNum)
-      x.map(_.toString).must_==(JsSuccess("12.345"))
+      fromJson[JsonNode](jsNum).map(_.toString).must_==(JsSuccess("12.345"))
     }
 
     "Serialize JsNumbers with integers correctly" in {