From b8eb171c76a301f1ad41f4d41f4213f61377318d Mon Sep 17 00:00:00 2001 From: Martin Nonnenmacher Date: Thu, 23 May 2024 16:45:00 +0200 Subject: [PATCH] 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 --- notifier/src/main/kotlin/Notifier.kt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/notifier/src/main/kotlin/Notifier.kt b/notifier/src/main/kotlin/Notifier.kt index 171c98d5871e..d89742ecf897 100644 --- 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 { - providedProperties(customProperties.mapValues { (_, v) -> KotlinType(v::class) }) + providedProperties(customPropertyTypes) } override val evalConfig = ScriptEvaluationConfiguration {