From 50bac718c3b6cc3f1b76e003bfb4c2fc76e9b7fd Mon Sep 17 00:00:00 2001
From: Andre Kampert <andre@product-foundry.com>
Date: Fri, 16 Oct 2015 13:58:37 +0200
Subject: [PATCH] Upgrade to Play 2.4.3

---
 build.sbt                             | 2 +-
 src/main/scala/JsZipperNode.scala     | 4 ++--
 src/test/scala/JsExtensionsSpec.scala | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.sbt b/build.sbt
index dae128f..495dd0f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -15,7 +15,7 @@ scalaVersion := "2.11.0"
 crossScalaVersions := Seq("2.10.4", "2.11.0")
 
 libraryDependencies ++= Seq(
-  "com.typesafe.play"   %% "play-json"  % "2.3.1"          ,
+  "com.typesafe.play"   %% "play-json"  % "2.4.3"          ,
   "org.specs2"          %% "specs2"     % "2.3.12" % "test",
   "junit"                % "junit"      % "4.8"    % "test"
 )
diff --git a/src/main/scala/JsZipperNode.scala b/src/main/scala/JsZipperNode.scala
index 29134a8..85fc79d 100644
--- a/src/main/scala/JsZipperNode.scala
+++ b/src/main/scala/JsZipperNode.scala
@@ -49,11 +49,11 @@ object Node {
   val empty = Node.Empty
 
   case object Empty extends Node {
-    override val value = JsUndefined("undef")
+    override val value = JsNull
   }
 
   case class Error(error: (JsPath, String)) extends Node {
-    override val value = JsUndefined("error")
+    override val value = JsNull
   }
 
   def apply(key: String, value: JsValue): Node = KeyNode(key, value)
diff --git a/src/test/scala/JsExtensionsSpec.scala b/src/test/scala/JsExtensionsSpec.scala
index f8941b1..a96cfa7 100644
--- a/src/test/scala/JsExtensionsSpec.scala
+++ b/src/test/scala/JsExtensionsSpec.scala
@@ -237,7 +237,7 @@ class JsExtensionsSpec extends Specification {
     "update one path" in {
       js.update(
         (__ \ "key4")(3) \ "key411",
-        { js => val JsString(str) = js \ "key4111"; JsString(str+"123") }
+        { js => val JsString(str) = (js \ "key4111").get; JsString(str+"123") }
       ) must beEqualTo(
         Json.obj(
           "key1" -> Json.obj(
@@ -256,7 +256,7 @@ class JsExtensionsSpec extends Specification {
     "update path not found" in {
       js.update(
         (__ \ "key5"),
-        { js => val JsString(str) = js \ "key4111"; JsString(str+"123") }
+        { js => val JsString(str) = (js \ "key4111").get; JsString(str+"123") }
       ) must beEqualTo(js)
     }
 
@@ -275,7 +275,7 @@ class JsExtensionsSpec extends Specification {
         )
       )
       obj.updateAllKeyNodes{
-        case ((_ \ "_id"), value) => ("id" -> value \ "$oid")
+        case ((_ \ "_id"), value) => ("id" -> (value \ "$oid").get)
       } must beEqualTo(
         Json.obj(
           "id" -> "1234",