Refactor out Map.safeGet

Author: Vampire

buildSrc/src/main/kotlin/net/kautler/MapExtension.kt

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2019 Björn Kautler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.kautler
+
+fun <K, V> Map<K, V>.safeGet(key: K): V = get(key) ?: error("Key '$key' is missing")

buildSrc/src/main/kotlin/net/kautler/codenarc.gradle.kts

@@ -24,7 +24,7 @@ plugins {
 val versions: Map<String, String> by project
 
 codenarc {
-    toolVersion = versions["codenarc"] ?: error("codenarc version is missing")
+    toolVersion = versions.safeGet("codenarc")
     // customized copy from http://codenarc.sourceforge.net/StarterRuleSet-AllRulesByCategory.groovy.txt
     // update with new rules when version is updated (previous version: 1.4)
     config = resources.text.fromFile("config/codenarc/codenarc.groovy")

buildSrc/src/main/kotlin/net/kautler/pmd.gradle.kts

@@ -23,7 +23,7 @@ plugins {
 val versions: Map<String, String> by project
 
 pmd {
-    toolVersion = versions["pmd"] ?: error("pmd version is missing")
+    toolVersion = versions.safeGet("pmd")
     // necessary due to https://github.com/gradle/gradle/issues/8514
     ruleSets.clear()
     ruleSetConfig = resources.text.fromFile("config/pmd/pmd.xml")

buildSrc/src/main/kotlin/net/kautler/spotbugs.gradle.kts

@@ -32,7 +32,7 @@ plugins {
 val versions: Map<String, String> by project
 
 spotbugs {
-    toolVersion = versions["spotbugs"] ?: error("spotbugs version is missing")
+    toolVersion = versions.safeGet("spotbugs")
     reportLevel = string(project, "spotbugs.reportLevel", "low").getValue()
     @Suppress("UnstableApiUsage")
     excludeFilterConfig = resources.text.fromFile("config/spotbugs/spotbugs-exclude.xml")

buildSrc/src/main/kotlin/net/kautler/tests.gradle.kts

@@ -16,7 +16,6 @@
 
 package net.kautler
 
-import info.solidsoft.gradle.pitest.PitestTask
 import org.pitest.mutationtest.engine.gregor.config.Mutator
 import java.util.concurrent.TimeUnit.SECONDS
 import javax.naming.ConfigurationException
@@ -63,7 +62,7 @@ dependencies {
 }
 
 jacoco {
-    toolVersion = versions["jacoco"] ?: error("jacoco version is missing")
+    toolVersion = versions.safeGet("jacoco")
 }
 
 tasks.test {
@@ -118,7 +117,7 @@ tasks.check {
 }
 
 pitest {
-    pitestVersion(versions["pitest"] ?: error("pitest version is missing"))
+    pitestVersion(versions.safeGet("pitest"))
     // work-around for https://github.com/hcoles/pitest/pull/687
     testPlugin("spock")
     mutators(listOf(

buildSrc/src/main/kotlin/net/kautler/versions.gradle.kts

@@ -89,7 +89,7 @@ configurations.configureEach {
     resolutionStrategy {
         eachDependency {
             if (requested.group == "org.codehaus.groovy") {
-                useVersion(versions["groovy"] ?: error("groovy version is missing"))
+                useVersion(versions.safeGet("groovy"))
             }
         }
     }