From 980deaf70e4e0ba906d0af534aebc839015f0581 Mon Sep 17 00:00:00 2001
From: vlad <vlad@drivergrp.com>
Date: Sat, 16 Jul 2016 02:43:54 -0400
Subject: Dependency injection through constructor parameters + bug fixes

---
 src/main/scala/com/drivergrp/core/config.scala | 36 +++++---------------------
 1 file changed, 7 insertions(+), 29 deletions(-)

(limited to 'src/main/scala/com/drivergrp/core/config.scala')

diff --git a/src/main/scala/com/drivergrp/core/config.scala b/src/main/scala/com/drivergrp/core/config.scala
index 5a89752..bc17d6b 100644
--- a/src/main/scala/com/drivergrp/core/config.scala
+++ b/src/main/scala/com/drivergrp/core/config.scala
@@ -6,38 +6,16 @@ import com.typesafe.config.{Config, ConfigFactory}
 
 object config {
 
-  trait ConfigModule {
-    def config: Config
-  }
-
-  /**
-    * Configuration implementation providing config which is specified as the parameter
-    * which might be used for testing purposes
-    *
-    * @param config fixed config to provide
-    */
-  class DefaultConfigModule(val config: Config) extends ConfigModule
-
-  /**
-    * Configuration implementation reading default typesafe config
-    */
-  trait TypesafeConfigModule extends ConfigModule {
+  def loadDefaultConfig: Config = {
+    val configDefaults =
+      ConfigFactory.load(this.getClass.getClassLoader, "application.conf")
 
-    private val internalConfig: Config = {
-      val configDefaults =
-        ConfigFactory.load(this.getClass.getClassLoader, "application.conf")
+    scala.sys.props.get("application.config") match {
 
-      scala.sys.props.get("application.config") match {
+      case Some(filename) =>
+        ConfigFactory.parseFile(new File(filename)).withFallback(configDefaults)
 
-        case Some(filename) =>
-          ConfigFactory.parseFile(new File(filename)).withFallback(configDefaults)
-
-        case None => configDefaults
-      }
+      case None => configDefaults
     }
-
-    protected val rootConfig = internalConfig
-
-    val config = rootConfig
   }
 }
-- 
cgit v1.2.3