Merge pull request #95 from alanwguo/master

oporkka · web-flow · commit 0c83087df498 · 2017-07-05T09:38:28.000+02:00
Allow null as value to represent no values for optionals in spray-json formatter
diff --git a/src/main/scala/org/zalando/jsonapi/json/sprayjson/SprayJsonReadSupport.scala b/src/main/scala/org/zalando/jsonapi/json/sprayjson/SprayJsonReadSupport.scala
@@ -10,6 +10,7 @@ private[json] object SprayJsonReadSupport {
   implicit class RichJsObject(val obj: JsObject) extends AnyVal {
     def fieldOpt(fieldName: String): Option[JsValue] =
       obj.getFields(fieldName).toList match {
+        case Seq(JsNull) ⇒ None
         case Seq(value) ⇒ Some(value)
         case _ ⇒ None
       }
diff --git a/src/test/scala/org/zalando/jsonapi/json/JsonBaseSpec.scala b/src/test/scala/org/zalando/jsonapi/json/JsonBaseSpec.scala
@@ -44,6 +44,9 @@ trait JsonBaseSpec[JsonBaseType] extends WordSpec {
 
   protected lazy val resourceObjectWithEmptyRelationshipsJson = parseJson(resourceObjectWithEmptyRelationshipsJsonString)
 
+  protected lazy val resourceObjectWithNullRelationshipJson = parseJson(resourceObjectWithNullRelationshipJsonString)
+
+
   protected lazy val attributesJsonString =
     """
       |{
@@ -632,4 +635,33 @@ trait JsonBaseSpec[JsonBaseType] extends WordSpec {
       )
     ))
   ))
+
+  protected lazy val resourceObjectWithNullRelationshipJsonString =
+    """
+      |{
+      |  "data": [{
+      |    "type": "person",
+      |    "id": "1234",
+      |    "attributes": {
+      |      "name": "foobar"
+      |    },
+      |    "relationships": {
+      |      "father": {
+      |        "data": null
+      |      }
+      |    }
+      |  }]
+      |}
+    """.stripMargin
+
+  protected lazy val resourceObjectWithNullRelationshipObject = RootObject(Some(
+    ResourceObjects(List(
+      ResourceObject(
+        `type` = "person",
+        id = Some("1234"),
+        attributes = Some(List(Attribute("name", StringValue("foobar")))),
+        relationships = Some(Map("father" -> Relationship()))
+      )
+    ))
+  ))
 }
diff --git a/src/test/scala/org/zalando/jsonapi/json/sprayjson/SprayJsonJsonapiFormatSpec.scala b/src/test/scala/org/zalando/jsonapi/json/sprayjson/SprayJsonJsonapiFormatSpec.scala
@@ -109,6 +109,9 @@ class SprayJsonJsonapiFormatSpec extends JsonBaseSpec[JsValue] with MustMatchers
       "transform empty relationship object correctly" in {
         resourceObjectWithEmptyRelationshipsJson.convertTo[RootObject] === resourceObjectWithEmptyRelationshipsObject
       }
+      "transform null relationship object correctly" in {
+        resourceObjectWithNullRelationshipJson.convertTo[RootObject] === resourceObjectWithNullRelationshipObject
+      }
       "fail if data is not an array nor an object" in {
         val json = s"""{"data": "foo"}""".parseJson
         intercept[DeserializationException] {

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ private[json] object SprayJsonReadSupport {`
`10`	`10`	`implicit class RichJsObject(val obj: JsObject) extends AnyVal {`
`11`	`11`	`def fieldOpt(fieldName: String): Option[JsValue] =`
`12`	`12`	`obj.getFields(fieldName).toList match {`
	`13`	`+ case Seq(JsNull) ⇒ None`
`13`	`14`	`case Seq(value) ⇒ Some(value)`
`14`	`15`	`case _ ⇒ None`
`15`	`16`	`}`