Merge pull request #2 from connorwyatt/fix-server-builder

Fix server package

server/src/main/kotlin/io/connorwyatt/common/server/ApplicationConfiguration.kt

@@ -1,103 +1,126 @@
 package io.connorwyatt.common.server
 
 import io.connorwyatt.common.eventstore.configuration.EventStoreConfiguration
+import io.connorwyatt.common.eventstore.kodein.eventStoreDependenciesModule
 import io.connorwyatt.common.eventstore.ktor.configureEventStore
+import io.connorwyatt.common.http.httpDependenciesModule
 import io.connorwyatt.common.mongodb.configuration.MongoDBConfiguration
+import io.connorwyatt.common.mongodb.kodein.mongoDBDependenciesModule
 import io.connorwyatt.common.mongodb.ktor.configureMongoDB
 import io.connorwyatt.common.rabbitmq.configuration.RabbitMQConfiguration
+import io.connorwyatt.common.rabbitmq.kodein.rabbitMQDependenciesModule
 import io.connorwyatt.common.rabbitmq.ktor.configureRabbitMQ
+import io.connorwyatt.common.time.timeDependenciesModule
 import io.ktor.server.application.*
 import io.ktor.server.plugins.requestvalidation.*
 import io.ktor.server.plugins.statuspages.*
 import io.ktor.server.routing.*
 import kotlinx.coroutines.runBlocking
-import org.kodein.di.DI
-import org.kodein.di.ktor.di
-
-class ApplicationConfiguration(block: Builder.() -> Unit) {
-    val di = DI { importAll(builder.diModules) }
-
-    private val builder: Builder = Builder().apply(block)
+import org.kodein.di.*
+import org.kodein.di.ktor.*
 
+class ApplicationConfiguration
+internal constructor(val di: DI, private val configureApplication: Application.() -> Unit) {
     fun applyTo(application: Application) {
-        application.apply {
-            di { extend(di) }
-            builder.mongoDBConfiguration?.let { runBlocking { configureMongoDB() } }
-            builder.eventStoreConfiguration?.let { configureEventStore(it) }
-            builder.rabbitMQConfiguration?.let { configureRabbitMQ(it) }
-            configureSerialization()
-            builder.configureRequestValidation?.let { configureRequestValidation(it) }
-            configureStatusPages(builder.configureStatusPages)
-            configureCallId()
-            configureCallLogging()
-            builder.configureRouting?.let { configureRouting(it) }
-        }
+        configureApplication.invoke(application)
     }
 
-    class Builder internal constructor() {
-        internal var diModules = listOf<DI.Module>()
-            private set
-
-        internal var eventStoreConfiguration: EventStoreConfiguration? = null
-            private set
-
-        internal var mongoDBConfiguration: MongoDBConfiguration? = null
-            private set
-
-        internal var rabbitMQConfiguration: RabbitMQConfiguration? = null
-            private set
-
-        internal var http: Boolean = false
-            private set
-
-        internal var time: Boolean = false
-            private set
-
-        internal var configureRequestValidation: (RequestValidationConfig.() -> Unit)? = null
-            private set
-
-        internal var configureStatusPages: (StatusPagesConfig.() -> Unit)? = null
-            private set
+    class Builder {
+        private var diModules = listOf<DI.Module>()
+        private var builderDIModules = listOf<DI.Module>()
+        private var allowDIOverrides = false
+        private var eventStoreConfiguration: EventStoreConfiguration? = null
+        private var mongoDBConfiguration: MongoDBConfiguration? = null
+        private var rabbitMQConfiguration: RabbitMQConfiguration? = null
+        private var http: Boolean = false
+        private var time: Boolean = false
+        private var configureRequestValidation: (RequestValidationConfig.() -> Unit)? = null
+        private var configureStatusPages: (StatusPagesConfig.() -> Unit)? = null
+        private var configureRouting: (Routing.() -> Unit)? = null
+
+        fun addDIModule(diModule: DI.Module): Builder {
+            this.diModules = this.diModules.plus(diModules)
+            return this
+        }
 
-        internal var configureRouting: (Routing.() -> Unit)? = null
-            private set
+        fun addDIModules(diModules: List<DI.Module>): Builder {
+            this.diModules = this.diModules.plus(diModules)
+            return this
+        }
 
-        fun addDIModule(diModule: DI.Module) {
-            diModules = diModules.plus(diModule)
+        fun allowDIOverrides(allowDIOverrides: Boolean): Builder {
+            this.allowDIOverrides = allowDIOverrides
+            return this
         }
 
-        fun addEventStore(eventStoreConfiguration: EventStoreConfiguration) {
+        fun addEventStore(eventStoreConfiguration: EventStoreConfiguration): Builder {
             this.eventStoreConfiguration = eventStoreConfiguration
+            builderDIModules =
+                builderDIModules.plus(eventStoreDependenciesModule(eventStoreConfiguration))
+            return this
         }
 
-        fun addMongoDB(mongoDBConfiguration: MongoDBConfiguration) {
+        fun addMongoDB(mongoDBConfiguration: MongoDBConfiguration): Builder {
             this.mongoDBConfiguration = mongoDBConfiguration
+            builderDIModules =
+                builderDIModules.plus(mongoDBDependenciesModule(mongoDBConfiguration))
+            return this
         }
 
-        fun addRabbitMQ(rabbitMQConfiguration: RabbitMQConfiguration) {
+        fun addRabbitMQ(rabbitMQConfiguration: RabbitMQConfiguration): Builder {
             this.rabbitMQConfiguration = rabbitMQConfiguration
+            builderDIModules =
+                builderDIModules.plus(rabbitMQDependenciesModule(rabbitMQConfiguration))
+            return this
         }
 
-        fun addHttp() {
+        fun addHttp(): Builder {
             this.http = true
+            builderDIModules = builderDIModules.plus(httpDependenciesModule)
+            return this
         }
 
-        fun addTime() {
+        fun addTime(): Builder {
             this.time = true
+            builderDIModules = builderDIModules.plus(timeDependenciesModule)
+            return this
         }
 
         fun configureRequestValidation(
             configureRequestValidation: RequestValidationConfig.() -> Unit
-        ) {
+        ): Builder {
             this.configureRequestValidation = configureRequestValidation
+            return this
         }
 
-        fun configureStatusPages(configureStatusPages: StatusPagesConfig.() -> Unit) {
+        fun configureStatusPages(configureStatusPages: StatusPagesConfig.() -> Unit): Builder {
             this.configureStatusPages = configureStatusPages
+            return this
         }
 
-        fun configureRouting(configureRouting: Routing.() -> Unit) {
+        fun configureRouting(configureRouting: Routing.() -> Unit): Builder {
             this.configureRouting = configureRouting
+            return this
+        }
+
+        fun build(): ApplicationConfiguration {
+            val di = DI {
+                importAll(builderDIModules, allowOverride = allowDIOverrides)
+                importAll(diModules, allowOverride = allowDIOverrides)
+            }
+
+            return ApplicationConfiguration(di) {
+                di { extend(di, allowOverride = allowDIOverrides) }
+                mongoDBConfiguration?.let { runBlocking { configureMongoDB() } }
+                eventStoreConfiguration?.let { configureEventStore(it) }
+                rabbitMQConfiguration?.let { configureRabbitMQ(it) }
+                configureSerialization()
+                configureRequestValidation?.let { configureRequestValidation(it) }
+                configureStatusPages(configureStatusPages)
+                configureCallId()
+                configureCallLogging()
+                configureRouting?.let { configureRouting(it) }
+            }
         }
     }
 }