1 files changed, 58 insertions, 58 deletions
diff --git a/src/main/kotlin/io/dico/parcels2/options/StorageOptions.kt b/src/main/kotlin/io/dico/parcels2/options/StorageOptions.kt
index 3d68701..29aab7a 100644
--- a/src/main/kotlin/io/dico/parcels2/options/StorageOptions.kt
+++ b/src/main/kotlin/io/dico/parcels2/options/StorageOptions.kt
@@ -1,59 +1,59 @@
-package io.dico.parcels2.options
-
-import com.zaxxer.hikari.HikariDataSource
-import io.dico.parcels2.logger
-import io.dico.parcels2.storage.Storage
-import io.dico.parcels2.storage.BackedStorage
-import io.dico.parcels2.storage.exposed.ExposedBacking
-import io.dico.parcels2.storage.getHikariConfig
-import javax.sql.DataSource
-
-object StorageOptionsFactories : PolymorphicOptionsFactories<Storage>("dialect", StorageOptions::class, ConnectionStorageFactory())
-
-class StorageOptions(dialect: String = "mariadb", options: Any = DataConnectionOptions()) : SimplePolymorphicOptions<Storage>(dialect, options, StorageOptionsFactories) {
-
-    fun getDataSourceFactory(): DataSourceFactory? {
-        return when (factory) {
-            is ConnectionStorageFactory -> factory.getDataSourceFactory(key, options)
-            else -> return null
-        }
-    }
-}
-
-typealias DataSourceFactory = () -> DataSource
-
-private class ConnectionStorageFactory : PolymorphicOptionsFactory<Storage> {
-    override val optionsClass = DataConnectionOptions::class
-    override val supportedKeys: List<String> = listOf("postgresql", "mariadb")
-
-    fun getDataSourceFactory(key: String, options: Any): DataSourceFactory {
-        val hikariConfig = getHikariConfig(key, options as DataConnectionOptions)
-        return { HikariDataSource(hikariConfig) }
-    }
-
-    override fun newInstance(key: String, options: Any, vararg extra: Any?): Storage {
-        return BackedStorage(ExposedBacking(getDataSourceFactory(key, options), (options as DataConnectionOptions).poolSize))
-    }
-}
-
-data class DataConnectionOptions(val address: String = "localhost",
-                                 val database: String = "parcels",
-                                 val username: String = "root",
-                                 val password: String = "",
-                                 val poolSize: Int = 4) {
-
-    fun splitAddressAndPort(defaultPort: Int = 3306): Pair<String, Int>? {
-        val idx = address.indexOf(":").takeUnless { it == -1 } ?: return Pair(address, defaultPort)
-
-        val addressName = address.substring(0, idx).takeUnless { it.isBlank() } ?: return null.also {
-            logger.error("(Invalidly) blank address in data storage options")
-        }
-
-        val port = address.substring(idx + 1).toIntOrNull() ?: return null.also {
-            logger.error("Invalid port number in data storage options: $it, using $defaultPort as default")
-        }
-
-        return Pair(addressName, port)
-    }
-
+package io.dico.parcels2.options
+
+import com.zaxxer.hikari.HikariDataSource
+import io.dico.parcels2.logger
+import io.dico.parcels2.storage.Storage
+import io.dico.parcels2.storage.BackedStorage
+import io.dico.parcels2.storage.exposed.ExposedBacking
+import io.dico.parcels2.storage.getHikariConfig
+import javax.sql.DataSource
+
+object StorageOptionsFactories : PolymorphicOptionsFactories<Storage>("dialect", StorageOptions::class, ConnectionStorageFactory())
+
+class StorageOptions(dialect: String = "mariadb", options: Any = DataConnectionOptions()) : SimplePolymorphicOptions<Storage>(dialect, options, StorageOptionsFactories) {
+
+    fun getDataSourceFactory(): DataSourceFactory? {
+        return when (factory) {
+            is ConnectionStorageFactory -> factory.getDataSourceFactory(key, options)
+            else -> return null
+        }
+    }
+}
+
+typealias DataSourceFactory = () -> DataSource
+
+private class ConnectionStorageFactory : PolymorphicOptionsFactory<Storage> {
+    override val optionsClass = DataConnectionOptions::class
+    override val supportedKeys: List<String> = listOf("postgresql", "mariadb")
+
+    fun getDataSourceFactory(key: String, options: Any): DataSourceFactory {
+        val hikariConfig = getHikariConfig(key, options as DataConnectionOptions)
+        return { HikariDataSource(hikariConfig) }
+    }
+
+    override fun newInstance(key: String, options: Any, vararg extra: Any?): Storage {
+        return BackedStorage(ExposedBacking(getDataSourceFactory(key, options), (options as DataConnectionOptions).poolSize))
+    }
+}
+
+data class DataConnectionOptions(val address: String = "localhost",
+                                 val database: String = "parcels",
+                                 val username: String = "root",
+                                 val password: String = "",
+                                 val poolSize: Int = 4) {
+
+    fun splitAddressAndPort(defaultPort: Int = 3306): Pair<String, Int>? {
+        val idx = address.indexOf(":").takeUnless { it == -1 } ?: return Pair(address, defaultPort)
+
+        val addressName = address.substring(0, idx).takeUnless { it.isBlank() } ?: return null.also {
+            logger.error("(Invalidly) blank address in data storage options")
+        }
+
+        val port = address.substring(idx + 1).toIntOrNull() ?: return null.also {
+            logger.error("Invalid port number in data storage options: $it, using $defaultPort as default")
+        }
+
+        return Pair(addressName, port)
+    }
+
 }
 \ No newline at end of file