From 7a2906409f704f27ea5cd6f5b543019901ecae94 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Wed, 21 Oct 2015 23:48:38 -0700 Subject: [PATCH] Better initialization. --- .../com/beust/kobalt/internal/remote/KobaltServer.kt | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/internal/remote/KobaltServer.kt b/src/main/kotlin/com/beust/kobalt/internal/remote/KobaltServer.kt index ae4f639d..c934aa7d 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/remote/KobaltServer.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/remote/KobaltServer.kt @@ -30,15 +30,9 @@ public class KobaltServer @Inject constructor(val args: Args) : Runnable, IComma val pending = arrayListOf() private val COMMAND_CLASSES = listOf(GetDependenciesCommand::class.java, PingCommand::class.java) - - private val COMMANDS = hashMapOf() - - init { - COMMAND_CLASSES.forEach { - val c = Kobalt.INJECTOR.getInstance(it) - COMMANDS.put(c.name, c) - } - } + private val COMMANDS = mapOf(*(COMMAND_CLASSES.map { it -> + Kobalt.INJECTOR.getInstance(it).let { Pair(it.name, it) } + }.toTypedArray())) override fun run() { val portNumber = args.port