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 index 2659bfb..3836e61 100644 --- 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 index d7e3756..d7e7068 100644 --- 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/core/src/main/scala/ru/maizy/ambient7/core/config/InfluxDbConfigReader.scala b/core/src/main/scala/ru/maizy/ambient7/core/config/reader/InfluxDbConfigReader.scala similarity index 96% rename from core/src/main/scala/ru/maizy/ambient7/core/config/InfluxDbConfigReader.scala rename to core/src/main/scala/ru/maizy/ambient7/core/config/reader/InfluxDbConfigReader.scala index 25d4ac4..fa4e4c4 100644 --- a/core/src/main/scala/ru/maizy/ambient7/core/config/InfluxDbConfigReader.scala +++ b/core/src/main/scala/ru/maizy/ambient7/core/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/core/src/main/scala/ru/maizy/ambient7/core/config/MainDbConfigReader.scala b/core/src/main/scala/ru/maizy/ambient7/core/config/reader/MainDbConfigReader.scala similarity index 92% rename from core/src/main/scala/ru/maizy/ambient7/core/config/MainDbConfigReader.scala rename to core/src/main/scala/ru/maizy/ambient7/core/config/reader/MainDbConfigReader.scala index d4a403f..3475925 100644 --- a/core/src/main/scala/ru/maizy/ambient7/core/config/MainDbConfigReader.scala +++ b/core/src/main/scala/ru/maizy/ambient7/core/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/core/src/main/scala/ru/maizy/ambient7/core/config/UniversalConfigReader.scala b/core/src/main/scala/ru/maizy/ambient7/core/config/reader/UniversalConfigReader.scala similarity index 98% rename from core/src/main/scala/ru/maizy/ambient7/core/config/UniversalConfigReader.scala rename to core/src/main/scala/ru/maizy/ambient7/core/config/reader/UniversalConfigReader.scala index 8c099ab..0ca27be 100644 --- a/core/src/main/scala/ru/maizy/ambient7/core/config/UniversalConfigReader.scala +++ b/core/src/main/scala/ru/maizy/ambient7/core/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/core/src/test/scala/ru/maizy/ambient7/core/tests/config/SampleReaders.scala b/core/src/test/scala/ru/maizy/ambient7/core/tests/config/reader/SampleReaders.scala similarity index 94% rename from core/src/test/scala/ru/maizy/ambient7/core/tests/config/SampleReaders.scala rename to core/src/test/scala/ru/maizy/ambient7/core/tests/config/reader/SampleReaders.scala index 1a761dc..bfc09c2 100644 --- a/core/src/test/scala/ru/maizy/ambient7/core/tests/config/SampleReaders.scala +++ b/core/src/test/scala/ru/maizy/ambient7/core/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/core/src/test/scala/ru/maizy/ambient7/core/tests/config/UniversalConfigReaderSpec.scala b/core/src/test/scala/ru/maizy/ambient7/core/tests/config/reader/UniversalConfigReaderSpec.scala similarity index 98% rename from core/src/test/scala/ru/maizy/ambient7/core/tests/config/UniversalConfigReaderSpec.scala rename to core/src/test/scala/ru/maizy/ambient7/core/tests/config/reader/UniversalConfigReaderSpec.scala index cf55929..3fe862a 100644 --- a/core/src/test/scala/ru/maizy/ambient7/core/tests/config/UniversalConfigReaderSpec.scala +++ b/core/src/test/scala/ru/maizy/ambient7/core/tests/config/reader/UniversalConfigReaderSpec.scala @@ -1,4 +1,4 @@ -package ru.maizy.ambient7.core.tests.config +package ru.maizy.ambient7.core.tests.config.reader /** * Copyright (c) Nikita Kovaliov, maizy.ru, 2016-2017 @@ -6,7 +6,8 @@ package ru.maizy.ambient7.core.tests.config */ 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 {