From 96b5808628fa199d09e6e09a96c8b3f9c1e70641 Mon Sep 17 00:00:00 2001 From: hrj Date: Tue, 13 Apr 2021 14:01:25 +0530 Subject: [PATCH] correctly parse parameter values from config Signed-off-by: hrj --- src/main/scala/lc/core/config.scala | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/src/main/scala/lc/core/config.scala b/src/main/scala/lc/core/config.scala index 09dbc20..233108f 100644 --- a/src/main/scala/lc/core/config.scala +++ b/src/main/scala/lc/core/config.scala @@ -44,25 +44,9 @@ object Config { case JField("config", JObject(config)) => ("config", JString(config.toString)) } val captchaConfig: List[CaptchaConfig] = captchaConfigTransform.extract[List[CaptchaConfig]] - val allowedLevels: Set[String] = getAllValues(configJson, ParametersEnum.ALLOWEDLEVELS.toString) - val allowedMedia: Set[String] = getAllValues(configJson, ParametersEnum.ALLOWEDMEDIA.toString) - val allowedInputType: Set[String] = getAllValues(configJson, ParametersEnum.ALLOWEDINPUTTYPE.toString) - - private def getAllValues(config: JValue, param: String): Set[String] = { - val configValues = (config \\ param) - val result = for { - JObject(child) <- configValues - JField(param) <- child - } yield (param) - - var valueSet = Set[String]() - for (valueList <- result) { - for (value <- valueList._2.children) { - valueSet += value.values.toString - } - } - valueSet - } + val allowedLevels: Set[String] = captchaConfig.flatMap(_.allowedLevels).toSet + val allowedMedia: Set[String] = captchaConfig.flatMap(_.allowedMedia).toSet + val allowedInputType: Set[String] = captchaConfig.flatMap(_.allowedInputType).toSet private def getDefaultConfig(): String = { val defaultConfigMap =