From 1c8c7ba8d7bd884230cf18445b8812a8c7dde074 Mon Sep 17 00:00:00 2001
From: Hubert Van De Walle <hubv@protonmail.com>
Date: Mon, 20 Apr 2020 16:28:55 +0200
Subject: [PATCH] Clean

---
 api/src/NotesApplication.kt     | 7 +++----
 api/src/migrations/Migration.kt | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/api/src/NotesApplication.kt b/api/src/NotesApplication.kt
index 0e0cf25..b0ce2c1 100644
--- a/api/src/NotesApplication.kt
+++ b/api/src/NotesApplication.kt
@@ -31,7 +31,7 @@ fun Application.module() {
         import(configurationModule)
         import(serviceModule)
 
-        bind<Feature>() with singleton { Migration(this.kodein) }
+        bind<Migration>() with singleton { Migration(this.kodein) }
         bind<Database>() with singleton { Database.Companion.connect(this.instance<DataSource>()) }
     }
 
@@ -39,9 +39,8 @@ fun Application.module() {
 
     log.debug(kodein.container.tree.bindings.description())
 
-    // TODO, clean this (migration)
-    val feature by kodein.instance<Feature>()
-    feature.execute()
+    val migration by kodein.instance<Migration>()
+    migration.migrate()
 
     val controllers by kodein.instance<Set<KodeinController>>()
 
diff --git a/api/src/migrations/Migration.kt b/api/src/migrations/Migration.kt
index e661262..357465d 100644
--- a/api/src/migrations/Migration.kt
+++ b/api/src/migrations/Migration.kt
@@ -1,14 +1,14 @@
 package be.vandewalleh.migrations
 
-import be.vandewalleh.features.Feature
 import org.flywaydb.core.Flyway
 import org.kodein.di.Kodein
+import org.kodein.di.KodeinAware
 import org.kodein.di.generic.instance
 import javax.sql.DataSource
 
-class Migration(override val kodein: Kodein) : Feature(kodein) {
+class Migration(override val kodein: Kodein) : KodeinAware {
 
-    override fun execute() {
+    fun migrate() {
         val dataSource by instance<DataSource>()
         val flyway = Flyway.configure()
             .dataSource(dataSource)