detekt

Author: samgst-amazon

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationCustomDeserializers.kt

@@ -116,9 +116,8 @@ class NotConditionDeserializer : JsonDeserializer<NotificationExpression.NotCond
 
 // Create a custom deserializer if needed
 class NotificationTypeDeserializer : JsonDeserializer<NotificationScheduleType>() {
-    override fun deserialize(p: JsonParser, ctxt: DeserializationContext): NotificationScheduleType {
-        return NotificationScheduleType.fromString(p.valueAsString)
-    }
+    override fun deserialize(p: JsonParser, ctxt: DeserializationContext): NotificationScheduleType =
+        NotificationScheduleType.fromString(p.valueAsString)
 }
 
 private fun JsonNode.toNotificationExpressions(p: JsonParser): List<NotificationExpression> = this.map { element ->

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt

@@ -45,12 +45,11 @@ enum class NotificationScheduleType {
     ;
 
     companion object {
-        fun fromString(value: String): NotificationScheduleType {
-            return when (value.lowercase()) {
+        fun fromString(value: String): NotificationScheduleType =
+            when (value.lowercase()) {
                 "startup" -> STARTUP
                 else -> EMERGENCY
             }
-        }
     }
 }
 

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/ProcessNotificationsBase.kt

@@ -57,7 +57,7 @@ class ProcessNotificationsBase(
                 ?.filter { notification ->
                     !NotificationDismissalState.getInstance().isDismissed(notification.id)
                 }
-                ?: emptyList()
+                .orEmpty()
 
             activeNotifications.forEach { processNotification(project, it) }
         }