#76 Fix order when extracting list of strings from Fields object

TheHive-Project · Dec 19, 2018 · d87f867 · d87f867
1 parent 72a6e94
commit d87f867
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/app/org/elastic4play/controllers/Fields.scala b/app/org/elastic4play/controllers/Fields.scala
@@ -101,10 +101,7 @@ class Fields(private val fields: Map[String, InputValue]) {
     */
   def getStrings(name: String): Option[Seq[String]] = fields.get(name) flatMap {
     case StringInputValue(ss) ⇒ Some(ss)
-    case JsonInputValue(JsArray(js)) ⇒ js.foldLeft[Option[Seq[String]]](Some(Nil)) {
-      case (Some(l), JsString(s)) ⇒ Some(s +: l)
-      case _                      ⇒ None
-    }
+    case JsonInputValue(js: JsArray) ⇒ js.asOpt[Seq[String]]
     case _ ⇒ None
   }
 
@@ -113,10 +110,7 @@ class Fields(private val fields: Map[String, InputValue]) {
     */
   def getStrings(name: String, separator: String): Option[Seq[String]] = fields.get(name) flatMap {
     case StringInputValue(ss) ⇒ Some(ss.flatMap(_.split(separator)).filterNot(_.isEmpty))
-    case JsonInputValue(JsArray(js)) ⇒ js.foldLeft[Option[Seq[String]]](Some(Nil)) {
-      case (Some(l), JsString(s)) ⇒ Some(s +: l)
-      case _                      ⇒ None
-    }
+    case JsonInputValue(js: JsArray) ⇒ js.asOpt[Seq[String]]
     case _ ⇒ None
   }