From 852d8e5dc0b785c587f0f19250b5b8949e8b20cc Mon Sep 17 00:00:00 2001
From: Peter van 't Hof <p.j.van_t_hof@lumc.nl>
Date: Fri, 9 Jan 2015 13:56:38 +0100
Subject: [PATCH] Refactor getValueFromMap method
---
.../lumc/sasc/biopet/core/config/Config.scala | 64 +++++++++++--------
.../sasc/biopet/core/config/ConfigTest.scala | 8 +++
2 files changed, 47 insertions(+), 25 deletions(-)
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/config/Config.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/config/Config.scala
index 31eb2936e..bf476eac4 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/config/Config.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/config/Config.scala
@@ -186,35 +186,49 @@ object Config extends Logging {
/**
* Search for value in index position in a map
* @param map Map to search in
- * @param index Config index
+ * @param startIndex Config index
* @return Value
*/
- def getValueFromMap(map: Map[String, Any], index: ConfigValueIndex): Option[ConfigValue] = {
- var submodules = index.path
- while (!submodules.isEmpty) {
- var submodules2 = submodules
- while (!submodules2.isEmpty) {
- val p = getMapFromPath(map, submodules2 ::: index.module :: Nil) getOrElse Map()
- if (p.contains(index.key)) {
- return Option(ConfigValue(index, ConfigValueIndex(index.module, submodules2, index.key, freeVar = false), p(index.key)))
- }
- if (index.freeVar) {
- val p2 = getMapFromPath(map, submodules2) getOrElse Map()
- if (p2.contains(index.key)) {
- return Option(ConfigValue(index, ConfigValueIndex(index.module, submodules2, index.key, freeVar = true), p2(index.key)))
- }
- }
- submodules2 = submodules2.init
+ def getValueFromMap(map: Map[String, Any], startIndex: ConfigValueIndex): Option[ConfigValue] = {
+ def getFromPath(path: List[String]): Option[ConfigValue] = {
+ val p = getValueFromPath(map, path ::: startIndex.module :: startIndex.key :: Nil)
+ if (p.isDefined) Option(ConfigValue(startIndex, ConfigValueIndex(startIndex.module, path, startIndex.key, freeVar = false), p.get))
+ else if (startIndex.freeVar) {
+ val p = getValueFromPath(map, path ::: startIndex.key :: Nil)
+ if (p.isDefined) Option(ConfigValue(startIndex, ConfigValueIndex(startIndex.module, path, startIndex.key, freeVar = true), p.get))
+ else None
+ } else None
+ }
+
+ def tailSearch(path: List[String]): Option[ConfigValue] = {
+ val p = getFromPath(path)
+ if (p != None) p
+ else if (path == Nil) None
+ else {
+ val p = initSearch(path)
+ if (p.isDefined) p
+ else tailSearch(path.tail)
}
- submodules = submodules.tail
}
- val p = getMapFromPath(map, index.module :: Nil) getOrElse Map()
- if (p.contains(index.key)) { // Module is not nested
- return Option(ConfigValue(index, ConfigValueIndex(index.module, Nil, index.key, freeVar = false), p(index.key)))
- } else if (map.contains(index.key) && index.freeVar) { // Root value of json
- return Option(ConfigValue(index, ConfigValueIndex("", Nil, index.key, freeVar = true), map(index.key)))
- } else { // At this point key is not found on the path
- return None
+
+ def initSearch(path: List[String], tail: List[String] = Nil): Option[ConfigValue] = {
+ val p = getFromPath(path)
+ if (p.isDefined) p
+ else if (path == Nil) None
+ else {
+ val p = skipNested(path, tail)
+ if (p.isDefined) p
+ else initSearch(path.init, path.last :: tail)
+ }
}
+
+ def skipNested(path: List[String], tail: List[String] = Nil): Option[ConfigValue] = {
+ val p = getFromPath(path ::: tail)
+ if (p.isDefined) p
+ else if (tail == Nil) None
+ else skipNested(path, tail.tail)
+ }
+
+ return tailSearch(startIndex.path)
}
}
\ No newline at end of file
diff --git a/public/biopet-framework/src/test/scala/nl/lumc/sasc/biopet/core/config/ConfigTest.scala b/public/biopet-framework/src/test/scala/nl/lumc/sasc/biopet/core/config/ConfigTest.scala
index a3d8c9ebc..27d1791a8 100644
--- a/public/biopet-framework/src/test/scala/nl/lumc/sasc/biopet/core/config/ConfigTest.scala
+++ b/public/biopet-framework/src/test/scala/nl/lumc/sasc/biopet/core/config/ConfigTest.scala
@@ -1,5 +1,6 @@
package nl.lumc.sasc.biopet.core.config
+import nl.lumc.sasc.biopet.utils.ConfigUtils._
import nl.lumc.sasc.biopet.utils.{ ConfigUtilsTest, ConfigUtils }
import org.scalatest.Matchers
import org.scalatest.mock.MockitoSugar
@@ -45,6 +46,13 @@ class ConfigTest extends TestNGSuite with MockitoSugar with Matchers with Config
new Config(map1).toString() shouldBe map1.toString()
}
+ @Test def testSkipNested: Unit = {
+ val map = Map("1" -> Map("2" -> Map("4" -> Map("5" -> Map("k1" -> "v1")))))
+ Config.getValueFromMap(map, new ConfigValueIndex("5", List("1", "2", "4", "5"), "k1")).get.asString shouldBe "v1"
+ Config.getValueFromMap(map, new ConfigValueIndex("5", List("1", "2", "3", "4", "5"), "k1")).get.asString shouldBe "v1"
+ Config.getValueFromMap(map, new ConfigValueIndex("5", List("1", "2", "3", "dummy", "dummy", "4", "5"), "k1")).get.asString shouldBe "v1"
+ }
+
@Test def testGetValueFromMap: Unit = {
val map = ConfigTest.map
Config.getValueFromMap(map, new ConfigValueIndex("m1", Nil, "k1")).get.asString shouldBe "v2"
--
GitLab