fix(notifier): Provide the types for mailClient and jiraClient

Make sure that the types for `mailClient` and `jiraClient` are always defined. Signed-off-by: Martin Nonnenmacher <[email protected]>
oss-review-toolkit · May 23, 2024 · b8eb171 · b8eb171
1 parent 2bfeec1
commit b8eb171
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/notifier/src/main/kotlin/Notifier.kt b/notifier/src/main/kotlin/Notifier.kt
@@ -43,15 +43,20 @@ class Notifier(
 ) : ScriptRunner() {
     private val customProperties = buildMap {
         put("ortResult", ortResult)
-
-        config.mail?.let { put("mailClient", MailNotifier(it)) }
-        config.jira?.let { put("jiraClient", JiraNotifier(it)) }
-
+        put("mailClient", config.mail?.let { MailNotifier(it) })
+        put("jiraClient", config.jira?.let { JiraNotifier(it) })
         put("resolutionProvider", resolutionProvider)
     }
 
+    private val customPropertyTypes = mapOf(
+        "ortResult" to KotlinType(OrtResult::class),
+        "mailClient" to KotlinType(MailNotifier::class, isNullable = true),
+        "jiraClient" to KotlinType(JiraNotifier::class, isNullable = true),
+        "resolutionProvider" to KotlinType(ResolutionProvider::class)
+    )
+
     override val compConfig = createJvmCompilationConfigurationFromTemplate<NotificationsScriptTemplate> {
-        providedProperties(customProperties.mapValues { (_, v) -> KotlinType(v::class) })
+        providedProperties(customPropertyTypes)
     }
 
     override val evalConfig = ScriptEvaluationConfiguration {