From 5f9e4a5ca45c6ede97f7922243de2c0c1d63ce9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Brais=20Gab=C3=ADn?= <braisgabin@gmail.com>
Date: Sat, 20 Nov 2021 19:42:55 +0100
Subject: [PATCH] Don't hide null issues (#4313)

* Don't hide null checks

* Simplify code
---
 .../io/gitlab/arturbosch/detekt/core/config/DefaultConfig.kt  | 2 +-
 .../arturbosch/detekt/core/tooling/DefaultConfigProvider.kt   | 2 +-
 .../main/kotlin/io/gitlab/arturbosch/detekt/DetektPlugin.kt   | 2 +-
 .../kotlin/io/github/detekt/report/html/HtmlOutputReport.kt   | 2 +-
 .../src/main/kotlin/io/github/detekt/test/utils/Resources.kt  | 4 +---
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/DefaultConfig.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/DefaultConfig.kt
index 095db02a2bf..0a8cdfc0340 100644
--- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/DefaultConfig.kt
+++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/DefaultConfig.kt
@@ -7,7 +7,7 @@ internal object DefaultConfig {
     const val RESOURCE_NAME = "default-detekt-config.yml"
 
     fun newInstance(): Config {
-        val configUrl = javaClass.getResource("/$RESOURCE_NAME")
+        val configUrl = javaClass.getResource("/$RESOURCE_NAME")!!
         return YamlConfig.loadResource(configUrl)
     }
 }
diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/tooling/DefaultConfigProvider.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/tooling/DefaultConfigProvider.kt
index a6d8a2d69ee..91107b0dc14 100644
--- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/tooling/DefaultConfigProvider.kt
+++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/tooling/DefaultConfigProvider.kt
@@ -12,7 +12,7 @@ class DefaultConfigProvider : DefaultConfigurationProvider {
     override fun get(): Config = DefaultConfig.newInstance()
 
     override fun copy(targetLocation: Path) {
-        val configUrl = javaClass.getResource("/${DefaultConfig.RESOURCE_NAME}")
+        val configUrl = javaClass.getResource("/${DefaultConfig.RESOURCE_NAME}")!!
         Files.copy(configUrl.openStream(), targetLocation, StandardCopyOption.REPLACE_EXISTING)
     }
 }
diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektPlugin.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektPlugin.kt
index 292a27c53d0..95ed38173da 100644
--- a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektPlugin.kt
+++ b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektPlugin.kt
@@ -120,6 +120,6 @@ const val CONFIGURATION_DETEKT = "detekt"
 const val CONFIGURATION_DETEKT_PLUGINS = "detektPlugins"
 
 internal fun loadDetektVersion(classLoader: ClassLoader): String = Properties().run {
-    load(classLoader.getResourceAsStream("versions.properties"))
+    load(classLoader.getResourceAsStream("versions.properties")!!)
     getProperty("detektVersion")
 }
diff --git a/detekt-report-html/src/main/kotlin/io/github/detekt/report/html/HtmlOutputReport.kt b/detekt-report-html/src/main/kotlin/io/github/detekt/report/html/HtmlOutputReport.kt
index b314c6d7902..cb3fee27474 100644
--- a/detekt-report-html/src/main/kotlin/io/github/detekt/report/html/HtmlOutputReport.kt
+++ b/detekt-report-html/src/main/kotlin/io/github/detekt/report/html/HtmlOutputReport.kt
@@ -47,7 +47,7 @@ class HtmlOutputReport : OutputReport() {
     override val name = "HTML report"
 
     override fun render(detektion: Detektion) =
-        javaClass.getResource("/$DEFAULT_TEMPLATE")
+        javaClass.getResource("/$DEFAULT_TEMPLATE")!!
             .openStream()
             .bufferedReader()
             .use { it.readText() }
diff --git a/detekt-test-utils/src/main/kotlin/io/github/detekt/test/utils/Resources.kt b/detekt-test-utils/src/main/kotlin/io/github/detekt/test/utils/Resources.kt
index 17e89b8c29d..0d177127363 100644
--- a/detekt-test-utils/src/main/kotlin/io/github/detekt/test/utils/Resources.kt
+++ b/detekt-test-utils/src/main/kotlin/io/github/detekt/test/utils/Resources.kt
@@ -10,9 +10,7 @@ internal object Resources
 
 fun resourceUrl(name: String): URL {
     val explicitName = if (name.startsWith("/")) name else "/$name"
-    val resource = Resources::class.java.getResource(explicitName)
-    requireNotNull(resource) { "Make sure the resource '$name' exists!" }
-    return resource
+    return requireNotNull(Resources::class.java.getResource(explicitName)) { "Make sure the resource '$name' exists!" }
 }
 
 fun resource(name: String): URI = resourceUrl(name).toURI()