From 009ddd3d16cab0266e47e9009524527164de22ce Mon Sep 17 00:00:00 2001
From: Hubert Van De Walle <hubv@protonmail.com>
Date: Tue, 6 Oct 2020 22:56:37 +0200
Subject: [PATCH] Use name as default artifactId

---
 config.toml                              | 15 ++-------------
 src/main/kotlin/starter/config/Config.kt |  2 +-
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/config.toml b/config.toml
index 4cdbf08..ec5ad51 100644
--- a/config.toml
+++ b/config.toml
@@ -27,7 +27,7 @@ flyway = "7.0.0"
 hikaricp = "3.4.5"
 ktorm = "3.0.0"
 junit = "5.7.0"
-mokk = "1.10.0"
+mockk = "1.10.0"
 hamkrest = "1.7.0.3"
 assertj = "3.17.2"
 kodein-di = "7.1.0"
@@ -54,7 +54,6 @@ default = true
 
 [dependencies.http4k-server-jetty]
 groupId = "org.http4k"
-artifactId = "http4k-server-jetty"
 version = "http4k"
 category = "http4k"
 default = true
@@ -62,43 +61,36 @@ logger = "org.eclipse.jetty"
 
 [dependencies.http4k-server-apache]
 groupId = "org.http4k"
-artifactId = "http4k-server-apache"
 version = "http4k"
 category = "http4k"
 
 [dependencies.http4k-client-apache]
 groupId = "org.http4k"
-artifactId = "http4k-client-apache"
 version = "http4k"
 category = "http4k"
 
 [dependencies.http4k-format-jackson]
 groupId = "org.http4k"
-artifactId = "http4k-format-jackson"
 version = "http4k"
 category = "http4k"
 
 [dependencies.http4k-format-kotlinx-serialization]
 groupId = "org.http4k"
-artifactId = "http4k-format-kotlinx-serialization"
 version = "http4k"
 category = "http4k"
 
 [dependencies.http4k-contract]
 groupId = "org.http4k"
-artifactId = "http4k-contract"
 version = "http4k"
 category = "http4k"
 
 [dependencies.pebble]
 groupId = "io.pebbletemplates"
-artifactId = "pebble"
 default = true
 logger = "com.mitchellbosecke.pebble"
 
 [dependencies.caffeine]
 groupId = "com.github.ben-manes.caffeine"
-artifactId = "caffeine"
 
 [dependencies.logback]
 groupId = "ch.qos.logback"
@@ -112,7 +104,6 @@ category = "database"
 
 [dependencies.h2]
 groupId = "com.h2database"
-artifactId = "h2"
 category = "database"
 
 [dependencies.flyway]
@@ -154,7 +145,7 @@ scope = "test"
 category = "test"
 default = true
 
-[dependencies.mokk]
+[dependencies.mockk]
 groupId = "io.mockk"
 artifactId = "mockk"
 scope = "test"
@@ -162,7 +153,6 @@ category = "test"
 
 [dependencies.hamkrest]
 groupId = "com.natpryce"
-artifactId = "hamkrest"
 scope = "test"
 category = "test"
 
@@ -198,5 +188,4 @@ category = "serialization"
 
 [dependencies.arrow-core]
 groupId = "io.arrow-kt"
-artifactId = "arrow-core"
 repository = "arrow"
diff --git a/src/main/kotlin/starter/config/Config.kt b/src/main/kotlin/starter/config/Config.kt
index e7aa557..7aa4dac 100644
--- a/src/main/kotlin/starter/config/Config.kt
+++ b/src/main/kotlin/starter/config/Config.kt
@@ -38,7 +38,7 @@ class Config {
                 Dependency(
                     name = name,
                     groupId = values["groupId"],
-                    artifactId = values["artifactId"],
+                    artifactId = values["artifactId"] ?: name,
                     version = Version(versionKey, version),
                     default = values.getOrElse("default", false),
                     category = values.getEnumOrElse("category", Category.Other),