Use Try

lloydmeta · Feb 20, 2015 · a1b2d10 · a1b2d10
1 parent 98edbff
commit a1b2d10
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/enumeratum-play/src/main/scala/enumeratum/Json.scala b/enumeratum-play/src/main/scala/enumeratum/Json.scala
@@ -2,6 +2,7 @@ package enumeratum
 
 import play.api.libs.json._
 
+import scala.util.Try
 import scala.util.control.NonFatal
 
 /**
@@ -15,10 +16,10 @@ object Json {
   def reads[A](enum: Enum[A]): Reads[A] = new Reads[A] {
     def reads(json: JsValue): JsResult[A] = json match {
       case JsString(s) => {
-        try {
+        Try {
           JsSuccess(enum.withName(s))
-        } catch {
-          case NonFatal(e) => JsError(s"Enumeration expected of type: '$enum', but it does not appear to contain the value: '$s'")
+        } getOrElse {
+          JsError(s"Enumeration expected of type: '$enum', but it does not appear to contain the value: '$s'")
         }
       }
       case _ => JsError("String value expected")