-
Notifications
You must be signed in to change notification settings - Fork 274
Condition Matcher for displaying notifications #5093
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.
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
Changes from 10 commits
c3cc2bf
09729c7
e909a0e
5a84e39
56c1888
a981227
dbfcefc
823ea7f
218c8ed
5743e94
899da9d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package software.aws.toolkits.jetbrains.core.notifications | ||
|
|
||
| fun checkSeverity(notificationSeverity: String): NotificationSeverity = when (notificationSeverity) { | ||
| "Critical" -> NotificationSeverity.CRITICAL | ||
| "Warning" -> NotificationSeverity.WARNING | ||
| "Info" -> NotificationSeverity.INFO | ||
| else -> NotificationSeverity.INFO | ||
| } | ||
|
Check warning on line 11 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/CustomizeNotificationsUi.kt
|
||
|
|
||
| // TODO: Add actions that can be performed from the notifications here | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package software.aws.toolkits.jetbrains.core.notifications | ||
|
|
||
| object DisplayToastNotifications | ||
Check warningCode scanning / QDJVMC Unused symbol Warning
Object "DisplayToastNotifications" is never used
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package software.aws.toolkits.jetbrains.core.notifications | ||
|
|
||
| import com.fasterxml.jackson.core.JsonParser | ||
| import com.fasterxml.jackson.core.JsonToken | ||
| import com.fasterxml.jackson.databind.DeserializationContext | ||
| import com.fasterxml.jackson.databind.JsonDeserializer | ||
| import com.fasterxml.jackson.databind.JsonMappingException | ||
| import com.fasterxml.jackson.databind.JsonNode | ||
|
|
||
| class OperationConditionDeserializer : JsonDeserializer<NotificationExpression.OperationCondition>() { | ||
| override fun deserialize(parser: JsonParser, ctxt: DeserializationContext): NotificationExpression.OperationCondition = when (parser.currentToken) { | ||
| JsonToken.VALUE_STRING -> { | ||
| // Handle direct string value | ||
| NotificationExpression.OperationCondition(parser.valueAsString) | ||
| } | ||
| else -> throw JsonMappingException(parser, "Cannot deserialize OperatingCondition") | ||
|
Check warning on line 19 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationCustomDeserializers.kt
|
||
| } | ||
| } | ||
|
|
||
| class ComparisonConditionDeserializer : JsonDeserializer<NotificationExpression.ComparisonCondition>() { | ||
| override fun deserialize(parser: JsonParser, ctxt: DeserializationContext): NotificationExpression.ComparisonCondition { | ||
| val op = OperationConditionDeserializer().deserialize(parser, ctxt) | ||
| return NotificationExpression.ComparisonCondition(op.value) | ||
| } | ||
| } | ||
|
|
||
| class NotEqualsConditionDeserializer : JsonDeserializer<NotificationExpression.NotEqualsCondition>() { | ||
| override fun deserialize(parser: JsonParser, ctxt: DeserializationContext): NotificationExpression.NotEqualsCondition { | ||
| val op = OperationConditionDeserializer().deserialize(parser, ctxt) | ||
| return NotificationExpression.NotEqualsCondition(op.value) | ||
| } | ||
| } | ||
| class GreaterThanConditionDeserializer : JsonDeserializer<NotificationExpression.GreaterThanCondition>() { | ||
| override fun deserialize(parser: JsonParser, ctxt: DeserializationContext): NotificationExpression.GreaterThanCondition { | ||
| val op = OperationConditionDeserializer().deserialize(parser, ctxt) | ||
| return NotificationExpression.GreaterThanCondition(op.value) | ||
| } | ||
| } | ||
| class GreaterThanOrEqualsConditionDeserializer : JsonDeserializer<NotificationExpression.GreaterThanOrEqualsCondition>() { | ||
| override fun deserialize(parser: JsonParser, ctxt: DeserializationContext): NotificationExpression.GreaterThanOrEqualsCondition { | ||
| val op = OperationConditionDeserializer().deserialize(parser, ctxt) | ||
| return NotificationExpression.GreaterThanOrEqualsCondition(op.value) | ||
| } | ||
| } | ||
| class LessThanConditionDeserializer : JsonDeserializer<NotificationExpression.LessThanCondition>() { | ||
| override fun deserialize(parser: JsonParser, ctxt: DeserializationContext): NotificationExpression.LessThanCondition { | ||
| val op = OperationConditionDeserializer().deserialize(parser, ctxt) | ||
| return NotificationExpression.LessThanCondition(op.value) | ||
| } | ||
| } | ||
| class LessThanOrEqualsConditionDeserializer : JsonDeserializer<NotificationExpression.LessThanOrEqualsCondition>() { | ||
| override fun deserialize(parser: JsonParser, ctxt: DeserializationContext): NotificationExpression.LessThanOrEqualsCondition { | ||
| val op = OperationConditionDeserializer().deserialize(parser, ctxt) | ||
| return NotificationExpression.LessThanOrEqualsCondition(op.value) | ||
| } | ||
| } | ||
| class ComplexOperationConditionDeserializer : JsonDeserializer<NotificationExpression.ComplexOperationCondition>() { | ||
| override fun deserialize(parser: JsonParser, ctxt: DeserializationContext): NotificationExpression.ComplexOperationCondition { | ||
| val node = parser.codec.readTree<JsonNode>(parser) | ||
| if (!node.isArray) { | ||
| throw JsonMappingException(parser, "anyOf/noneOf must contain an array of values") | ||
|
Check warning on line 64 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationCustomDeserializers.kt
|
||
| } | ||
| val values = node.map { it.asText() } | ||
| return NotificationExpression.ComplexOperationCondition(values) | ||
| } | ||
| } | ||
| class AnyOfConditionDeserializer : JsonDeserializer<NotificationExpression.AnyOfCondition>() { | ||
| override fun deserialize(parser: JsonParser, ctxt: DeserializationContext): NotificationExpression.AnyOfCondition { | ||
| val op = ComplexOperationConditionDeserializer().deserialize(parser, ctxt) | ||
| return NotificationExpression.AnyOfCondition(op.value) | ||
| } | ||
| } | ||
|
|
||
| class NoneOfConditionDeserializer : JsonDeserializer<NotificationExpression.NoneOfCondition>() { | ||
| override fun deserialize(parser: JsonParser, ctxt: DeserializationContext): NotificationExpression.NoneOfCondition { | ||
| val op = ComplexOperationConditionDeserializer().deserialize(parser, ctxt) | ||
| return NotificationExpression.NoneOfCondition(op.value) | ||
| } | ||
| } | ||
|
|
||
| class ComplexConditionDeserializer : JsonDeserializer<NotificationExpression.ComplexCondition>() { | ||
| override fun deserialize(parser: JsonParser, ctxt: DeserializationContext): NotificationExpression.ComplexCondition { | ||
| val node = parser.codec.readTree<JsonNode>(parser) | ||
| if (!node.isArray) { | ||
| throw JsonMappingException(parser, "or/and must contain an array of values") | ||
|
Check warning on line 88 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationCustomDeserializers.kt
|
||
| } | ||
| return NotificationExpression.ComplexCondition(node.toNotificationExpressions(parser)) | ||
| } | ||
| } | ||
| class OrConditionDeserializer : JsonDeserializer<NotificationExpression.OrCondition>() { | ||
| override fun deserialize(parser: JsonParser, ctxt: DeserializationContext): NotificationExpression.OrCondition { | ||
| val op = ComplexConditionDeserializer().deserialize(parser, ctxt) | ||
| return NotificationExpression.OrCondition(op.expectedValueList) | ||
| } | ||
| } | ||
|
|
||
| class AndConditionDeserializer : JsonDeserializer<NotificationExpression.AndCondition>() { | ||
| override fun deserialize(parser: JsonParser, ctxt: DeserializationContext): NotificationExpression.AndCondition { | ||
| val op = ComplexConditionDeserializer().deserialize(parser, ctxt) | ||
| return NotificationExpression.AndCondition(op.expectedValueList) | ||
| } | ||
| } | ||
|
|
||
| class NotConditionDeserializer : JsonDeserializer<NotificationExpression.NotCondition>() { | ||
|
Check warning on line 107 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationCustomDeserializers.kt
|
||
| override fun deserialize(p: JsonParser, ctxt: DeserializationContext): NotificationExpression.NotCondition { | ||
| val node = p.codec.readTree<JsonNode>(p) | ||
| val parser = node.traverse(p.codec) | ||
| parser.nextToken() | ||
|
Check warning on line 111 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationCustomDeserializers.kt
|
||
|
|
||
| return NotificationExpression.NotCondition(parser.readValueAs(NotificationExpression::class.java)) | ||
|
Check warning on line 113 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationCustomDeserializers.kt
|
||
| } | ||
| } | ||
|
|
||
| private fun JsonNode.toNotificationExpressions(p: JsonParser): List<NotificationExpression> = this.map { element -> | ||
| val parser = element.traverse(p.codec) | ||
| parser.nextToken() | ||
| parser.readValueAs(NotificationExpression::class.java) | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,183 @@ | ||
| // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package software.aws.toolkits.jetbrains.core.notifications | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty | ||
| import com.fasterxml.jackson.annotation.JsonSubTypes | ||
| import com.fasterxml.jackson.annotation.JsonTypeInfo | ||
| import com.fasterxml.jackson.databind.annotation.JsonDeserialize | ||
|
|
||
| data class NotificationsList( | ||
| val schema: Schema, | ||
| val notifications: List<NotificationData>?, | ||
| ) | ||
|
|
||
| data class Schema( | ||
| val version: String, | ||
| ) | ||
|
|
||
| data class NotificationData( | ||
| val id: String, | ||
| val schedule: NotificationSchedule, | ||
| val severity: String, | ||
| val condition: NotificationDisplayCondition?, | ||
| val content: NotificationContentDescriptionLocale, | ||
| val actions: List<NotificationFollowupActions>? = emptyList(), | ||
| ) | ||
|
|
||
| data class NotificationSchedule( | ||
| val type: String, | ||
| ) | ||
|
|
||
| enum class NotificationSeverity { | ||
| INFO, | ||
| WARNING, | ||
| CRITICAL, | ||
| } | ||
|
Check warning on line 37 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
|
|
||
| data class NotificationContentDescriptionLocale( | ||
| @JsonProperty("en-US") | ||
| val locale: NotificationContentDescription, | ||
|
Check warning on line 41 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| ) | ||
|
|
||
| data class NotificationContentDescription( | ||
| val title: String, | ||
| val description: String, | ||
| ) | ||
|
|
||
| data class NotificationFollowupActions( | ||
| val type: String, | ||
| val content: NotificationFollowupActionsContent, | ||
| ) | ||
|
|
||
| data class NotificationFollowupActionsContent( | ||
| @JsonProperty("en-US") | ||
| val locale: NotificationActionDescription, | ||
|
Check warning on line 56 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| ) | ||
|
|
||
| data class NotificationActionDescription( | ||
| val title: String, | ||
| val url: String?, | ||
| ) | ||
|
|
||
| data class NotificationDisplayCondition( | ||
| val compute: ComputeType?, | ||
| val os: SystemType?, | ||
| val ide: SystemType?, | ||
| val extension: List<ExtensionType>?, | ||
| val authx: List<AuthxType>?, | ||
| ) | ||
|
|
||
| data class ComputeType( | ||
| val type: NotificationExpression?, | ||
| val architecture: NotificationExpression?, | ||
| ) | ||
|
|
||
| data class SystemType( | ||
| val type: NotificationExpression?, | ||
| val version: NotificationExpression?, | ||
| ) | ||
|
|
||
| data class ExtensionType( | ||
| val id: String?, | ||
| val version: NotificationExpression?, | ||
| ) | ||
|
|
||
| @JsonTypeInfo( | ||
| use = JsonTypeInfo.Id.NAME, | ||
| include = JsonTypeInfo.As.WRAPPER_OBJECT | ||
| ) | ||
| @JsonSubTypes( | ||
| JsonSubTypes.Type(value = NotificationExpression.ComparisonCondition::class, name = "=="), | ||
| JsonSubTypes.Type(value = NotificationExpression.NotEqualsCondition::class, name = "!="), | ||
| JsonSubTypes.Type(value = NotificationExpression.GreaterThanCondition::class, name = ">"), | ||
| JsonSubTypes.Type(value = NotificationExpression.GreaterThanOrEqualsCondition::class, name = ">="), | ||
| JsonSubTypes.Type(value = NotificationExpression.LessThanCondition::class, name = "<"), | ||
| JsonSubTypes.Type(value = NotificationExpression.LessThanOrEqualsCondition::class, name = "<="), | ||
| JsonSubTypes.Type(value = NotificationExpression.AnyOfCondition::class, name = "anyOf"), | ||
| JsonSubTypes.Type(value = NotificationExpression.NotCondition::class, name = "not"), | ||
| JsonSubTypes.Type(value = NotificationExpression.OrCondition::class, name = "or"), | ||
| JsonSubTypes.Type(value = NotificationExpression.AndCondition::class, name = "and"), | ||
| JsonSubTypes.Type(value = NotificationExpression.NoneOfCondition::class, name = "noneOf") | ||
| ) | ||
| sealed interface NotificationExpression { | ||
| @JsonDeserialize(using = NotConditionDeserializer::class) | ||
| data class NotCondition( | ||
| val expectedValue: NotificationExpression, | ||
|
Check warning on line 107 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| ) : NotificationExpression | ||
|
|
||
| @JsonDeserialize(using = OrConditionDeserializer::class) | ||
| data class OrCondition( | ||
| val expectedValueList: List<NotificationExpression>, | ||
| ) : NotificationExpression | ||
|
|
||
| @JsonDeserialize(using = AndConditionDeserializer::class) | ||
| data class AndCondition( | ||
| val expectedValueList: List<NotificationExpression>, | ||
| ) : NotificationExpression | ||
|
|
||
| @JsonDeserialize(using = ComplexConditionDeserializer::class) | ||
| data class ComplexCondition( | ||
| val expectedValueList: List<NotificationExpression>, | ||
| ) : NotificationExpression | ||
|
|
||
| // General class for comparison operators | ||
| @JsonDeserialize(using = OperationConditionDeserializer::class) | ||
| data class OperationCondition( | ||
| val value: String, | ||
| ) : NotificationExpression | ||
|
|
||
| @JsonDeserialize(using = ComplexOperationConditionDeserializer::class) | ||
| data class ComplexOperationCondition( | ||
| val value: List<String>, | ||
| ) : NotificationExpression | ||
|
|
||
| @JsonDeserialize(using = ComparisonConditionDeserializer::class) | ||
| data class ComparisonCondition( | ||
| val value: String, | ||
| ) : NotificationExpression | ||
|
|
||
| @JsonDeserialize(using = NotEqualsConditionDeserializer::class) | ||
| data class NotEqualsCondition( | ||
| val value: String, | ||
| ) : NotificationExpression | ||
|
|
||
| @JsonDeserialize(using = GreaterThanConditionDeserializer::class) | ||
| data class GreaterThanCondition( | ||
| val value: String, | ||
| ) : NotificationExpression | ||
|
|
||
| @JsonDeserialize(using = GreaterThanOrEqualsConditionDeserializer::class) | ||
| data class GreaterThanOrEqualsCondition( | ||
| val value: String, | ||
| ) : NotificationExpression | ||
|
|
||
| @JsonDeserialize(using = LessThanConditionDeserializer::class) | ||
| data class LessThanCondition( | ||
| val value: String, | ||
| ) : NotificationExpression | ||
|
|
||
| @JsonDeserialize(using = LessThanOrEqualsConditionDeserializer::class) | ||
| data class LessThanOrEqualsCondition( | ||
| val value: String, | ||
| ) : NotificationExpression | ||
|
|
||
| @JsonDeserialize(using = AnyOfConditionDeserializer::class) | ||
| data class AnyOfCondition( | ||
| val value: List<String>, | ||
| ) : NotificationExpression | ||
|
|
||
| @JsonDeserialize(using = NoneOfConditionDeserializer::class) | ||
| data class NoneOfCondition( | ||
| val value: List<String>, | ||
| ) : NotificationExpression | ||
| } | ||
|
|
||
| data class AuthxType( | ||
| val feature: String, | ||
| val type: NotificationExpression?, | ||
| val region: NotificationExpression?, | ||
| val connectionState: NotificationExpression?, | ||
| val ssoScopes: NotificationExpression?, | ||
| ) | ||
Check warning
Code scanning / QDJVMC
Unused symbol Warning