From 0260bea9517a8377d1081b6dc7a40d70bb57d763 Mon Sep 17 00:00:00 2001
From: Hubert Van De Walle <hubv@protonmail.com>
Date: Sat, 24 Oct 2020 01:31:03 +0200
Subject: [PATCH] Move ConfigLoader

---
 .../main/kotlin/be/simplenotes/app/SimpleNotes.kt   |  1 +
 .../be/simplenotes/app/modules/ConfigModule.kt      | 13 -------------
 simplenotes-config/pom.xml                          |  6 ++++++
 .../kotlin/be/simplenotes/config/ConfigLoader.kt    |  7 ++-----
 .../kotlin/be/simplenotes/config/ConfigModule.kt    | 10 ++++++++++
 .../src/main/resources/application.properties       |  0
 6 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100644 simplenotes-app/src/main/kotlin/be/simplenotes/app/modules/ConfigModule.kt
 rename simplenotes-app/src/main/kotlin/be/simplenotes/app/Config.kt => simplenotes-config/src/main/kotlin/be/simplenotes/config/ConfigLoader.kt (87%)
 create mode 100644 simplenotes-config/src/main/kotlin/be/simplenotes/config/ConfigModule.kt
 rename {simplenotes-app => simplenotes-config}/src/main/resources/application.properties (100%)

diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/SimpleNotes.kt b/simplenotes-app/src/main/kotlin/be/simplenotes/app/SimpleNotes.kt
index 836802c..4179789 100644
--- a/simplenotes-app/src/main/kotlin/be/simplenotes/app/SimpleNotes.kt
+++ b/simplenotes-app/src/main/kotlin/be/simplenotes/app/SimpleNotes.kt
@@ -2,6 +2,7 @@ package be.simplenotes.app
 
 import be.simplenotes.app.extensions.addShutdownHook
 import be.simplenotes.app.modules.*
+import be.simplenotes.config.configModule
 import be.simplenotes.domain.domainModule
 import be.simplenotes.persistance.migrationModule
 import be.simplenotes.persistance.persistanceModule
diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/modules/ConfigModule.kt b/simplenotes-app/src/main/kotlin/be/simplenotes/app/modules/ConfigModule.kt
deleted file mode 100644
index 4699451..0000000
--- a/simplenotes-app/src/main/kotlin/be/simplenotes/app/modules/ConfigModule.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package be.simplenotes.app.modules
-
-import be.simplenotes.app.Config
-import be.simplenotes.app.utils.StaticFileResolver
-import org.koin.core.qualifier.named
-import org.koin.dsl.module
-
-val configModule = module {
-    single { Config() }
-    single { get<Config>().dataSourceConfig }
-    single { get<Config>().jwtConfig }
-    single { get<Config>().serverConfig }
-}
diff --git a/simplenotes-config/pom.xml b/simplenotes-config/pom.xml
index 1fc19b6..6f182b6 100644
--- a/simplenotes-config/pom.xml
+++ b/simplenotes-config/pom.xml
@@ -11,5 +11,11 @@
 
     <artifactId>simplenotes-config</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.koin</groupId>
+            <artifactId>koin-core</artifactId>
+        </dependency>
+    </dependencies>
 
 </project>
diff --git a/simplenotes-app/src/main/kotlin/be/simplenotes/app/Config.kt b/simplenotes-config/src/main/kotlin/be/simplenotes/config/ConfigLoader.kt
similarity index 87%
rename from simplenotes-app/src/main/kotlin/be/simplenotes/app/Config.kt
rename to simplenotes-config/src/main/kotlin/be/simplenotes/config/ConfigLoader.kt
index c714f7e..1e9c156 100644
--- a/simplenotes-app/src/main/kotlin/be/simplenotes/app/Config.kt
+++ b/simplenotes-config/src/main/kotlin/be/simplenotes/config/ConfigLoader.kt
@@ -1,12 +1,9 @@
-package be.simplenotes.app
+package be.simplenotes.config
 
-import be.simplenotes.config.DataSourceConfig
-import be.simplenotes.config.JwtConfig
-import be.simplenotes.config.ServerConfig
 import java.util.*
 import java.util.concurrent.TimeUnit
 
-class Config {
+class ConfigLoader {
     //region Config loading
     private val properties: Properties = javaClass
         .getResource("/application.properties")
diff --git a/simplenotes-config/src/main/kotlin/be/simplenotes/config/ConfigModule.kt b/simplenotes-config/src/main/kotlin/be/simplenotes/config/ConfigModule.kt
new file mode 100644
index 0000000..3c3ad59
--- /dev/null
+++ b/simplenotes-config/src/main/kotlin/be/simplenotes/config/ConfigModule.kt
@@ -0,0 +1,10 @@
+package be.simplenotes.config
+
+import org.koin.dsl.module
+
+val configModule = module {
+    single { ConfigLoader() }
+    single { get<ConfigLoader>().dataSourceConfig }
+    single { get<ConfigLoader>().jwtConfig }
+    single { get<ConfigLoader>().serverConfig }
+}
diff --git a/simplenotes-app/src/main/resources/application.properties b/simplenotes-config/src/main/resources/application.properties
similarity index 100%
rename from simplenotes-app/src/main/resources/application.properties
rename to simplenotes-config/src/main/resources/application.properties