From 3b5345c6790fb7f3ba334325243751a061f9574f Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Thu, 15 Jun 2017 13:44:02 +0200 Subject: refactor topLevelKeys extension on Config --- kamon-core/src/main/scala/kamon/package.scala | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'kamon-core/src/main/scala/kamon/package.scala') diff --git a/kamon-core/src/main/scala/kamon/package.scala b/kamon-core/src/main/scala/kamon/package.scala index e764d7f4..274f43f8 100644 --- a/kamon-core/src/main/scala/kamon/package.scala +++ b/kamon-core/src/main/scala/kamon/package.scala @@ -17,7 +17,7 @@ import java.util.concurrent.atomic.AtomicLong import java.util.concurrent.{Executors, ThreadFactory} -import com.typesafe.config.Config +import com.typesafe.config.{Config, ConfigUtil} import scala.collection.concurrent.TrieMap @@ -81,20 +81,16 @@ package object kamon { } } - implicit class UtilsOnConfig(val config: Config) extends AnyVal { import scala.collection.JavaConverters._ - def firstLevelKeys: Set[String] = { - config.entrySet().asScala.map { - case entry ⇒ entry.getKey.takeWhile(_ != '.') - } toSet - } + def topLevelKeys: Set[String] = + config.root().entrySet().asScala.map(_.getKey).toSet def configurations: Map[String, Config] = { - firstLevelKeys - .map(entry => (entry, config.getConfig(entry))) - .toMap + topLevelKeys + .map(entry => (entry, config.getConfig(ConfigUtil.joinPath(entry)))) + .toMap } } } -- cgit v1.2.3