Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions notifier/src/main/kotlin/Notifier.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) })
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the condition is now not at the outer level anymore, buildMap can be replaced with mapOf and "mailClient" to config.mail?.let { MailNotifier(it) } etc.

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),
Comment on lines +53 to +54
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Making these types nullable will be a breaking change because all notifier scripts will need to be adjusted.
Please change your commit message: fix(notifier)!:

"resolutionProvider" to KotlinType(ResolutionProvider::class)
)

override val compConfig = createJvmCompilationConfigurationFromTemplate<NotificationsScriptTemplate> {
providedProperties(customProperties.mapValues { (_, v) -> KotlinType(v::class) })
providedProperties(customPropertyTypes)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be inlined, like done here (using a vararg of pairs). And I'd probably inline customProperties then as well.

}

override val evalConfig = ScriptEvaluationConfiguration {
Expand Down
Loading