iss #24: extract config readers to package

maizy · Jan 23, 2017 · d0db1d9 · d0db1d9
1 parent 83586a9
commit d0db1d9
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git a/ambient7-webapp/src/main/scala/ru/maizy/ambient7/webapp/WebAppConfigReader.scala b/ambient7-webapp/src/main/scala/ru/maizy/ambient7/webapp/WebAppConfigReader.scala
@@ -5,7 +5,7 @@ package ru.maizy.ambient7.webapp
  * See LICENSE.txt for details.
  */
 
-import ru.maizy.ambient7.core.config.{ MainDbConfigReader, UniversalConfigReader }
+import ru.maizy.ambient7.core.config.reader.{ MainDbConfigReader, UniversalConfigReader }
 
 object WebAppConfigReader
   extends UniversalConfigReader

diff --git a/core/src/main/scala/ru/maizy/ambient7/core/config/helper/ConfigRuleOps.scala b/core/src/main/scala/ru/maizy/ambient7/core/config/helper/ConfigRuleOps.scala
@@ -5,11 +5,11 @@ package ru.maizy.ambient7.core.config.helper
  * See LICENSE.txt for details.
  */
 
-import ru.maizy.ambient7.core.config.{ Ambient7Options, ParsingError, UniversalConfigReader }
+import ru.maizy.ambient7.core.config.{ Ambient7Options, ParsingError }
 
 object ConfigRuleOps {
 
-  import UniversalConfigReader._
+  import ru.maizy.ambient7.core.config.reader.UniversalConfigReader._
 
   implicit class IfSuccessOp[T](configRes: configs.Result[T]) {
 

diff --git a/...t7/core/config/InfluxDbConfigReader.scala → .../config/reader/InfluxDbConfigReader.scala b/...t7/core/config/InfluxDbConfigReader.scala → .../config/reader/InfluxDbConfigReader.scala
@@ -1,10 +1,13 @@
-package ru.maizy.ambient7.core.config
+package ru.maizy.ambient7.core.config.reader
 
 /**
  * Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
  * See LICENSE.txt for details.
  */
 
+import ru.maizy.ambient7.core.config.{ Ambient7Options, Defaults, InfluxDbOptions, ParsingError }
+
+
 trait InfluxDbConfigReader extends UniversalConfigReader {
 
   private def influxDbOpts(opts: Ambient7Options)(fill: InfluxDbOptions => InfluxDbOptions): Ambient7Options = {

diff --git a/...ent7/core/config/MainDbConfigReader.scala → ...re/config/reader/MainDbConfigReader.scala b/...ent7/core/config/MainDbConfigReader.scala → ...re/config/reader/MainDbConfigReader.scala
@@ -1,10 +1,13 @@
-package ru.maizy.ambient7.core.config
+package ru.maizy.ambient7.core.config.reader
 
 /**
  * Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
  * See LICENSE.txt for details.
  */
 
+import ru.maizy.ambient7.core.config.{ Ambient7Options, DbOptions, Defaults, ParsingError }
+
+
 trait MainDbConfigReader extends UniversalConfigReader {
 
   import UniversalConfigReader._

diff --git a/...7/core/config/UniversalConfigReader.scala → ...config/reader/UniversalConfigReader.scala b/...7/core/config/UniversalConfigReader.scala → ...config/reader/UniversalConfigReader.scala
@@ -1,4 +1,4 @@
-package ru.maizy.ambient7.core.config
+package ru.maizy.ambient7.core.config.reader
 
 /**
  * Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
@@ -13,6 +13,7 @@ import com.typesafe.config.{ Config, ConfigFactory }
 import configs.Configs
 import scopt.OptionParser
 import ru.maizy.ambient7.core.config.helper.ConfigRuleOps.IfSuccessOp
+import ru.maizy.ambient7.core.config.{ Ambient7Options, ParsingError, configLogger }
 
 object UniversalConfigReader {
   type CheckResult = Either[ParsingError, Unit]

diff --git a/...nt7/core/tests/config/SampleReaders.scala → ...e/tests/config/reader/SampleReaders.scala b/...nt7/core/tests/config/SampleReaders.scala → ...e/tests/config/reader/SampleReaders.scala
@@ -1,11 +1,12 @@
-package ru.maizy.ambient7.core.tests.config
+package ru.maizy.ambient7.core.tests.config.reader
 
 /**
  * Copyright (c) Nikita Kovaliov, maizy.ru, 2017
  * See LICENSE.txt for details.
  */
 
-import ru.maizy.ambient7.core.config.{ DbOptions, UniversalConfigReader }
+import ru.maizy.ambient7.core.config.DbOptions
+import ru.maizy.ambient7.core.config.reader.UniversalConfigReader
 
 trait SampleReaders {
 

diff --git a/...ts/config/UniversalConfigReaderSpec.scala → ...ig/reader/UniversalConfigReaderSpec.scala b/...ts/config/UniversalConfigReaderSpec.scala → ...ig/reader/UniversalConfigReaderSpec.scala
@@ -1,12 +1,13 @@
-package ru.maizy.ambient7.core.tests.config
+package ru.maizy.ambient7.core.tests.config.reader
 
 /**
  * Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017
  * See LICENSE.txt for details.
  */
 
 import java.nio.file.Paths
-import ru.maizy.ambient7.core.config.{ Ambient7Options, DbOptions, ParsingError, UniversalConfigReader }
+import ru.maizy.ambient7.core.config.reader.UniversalConfigReader
+import ru.maizy.ambient7.core.config.{ Ambient7Options, DbOptions, ParsingError }
 import ru.maizy.ambient7.core.tests.BaseSpec
 
 class UniversalConfigReaderSpec extends BaseSpec with SampleReaders {