Remove state from companion object

Author: samgst-amazon

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

@@ -15,13 +15,13 @@ class NotificationPanel : BorderLayoutPanel() {
     init {
         isOpaque = false
         addToCenter(wrapper)
-        ProcessNotificationsBase.showBannerNotification.forEach {
-            updateNotificationPanel(it.value)
+        BannerNotificationService.getInstance().getNotifications().forEach { (_, content) ->
+            updateNotificationPanel(content)
         }
     }
 
     private fun removeNotificationPanel(notificationId: String) = runInEdt {
-        ProcessNotificationsBase.showBannerNotification.remove(notificationId)
+        BannerNotificationService.getInstance().removeNotification(notificationId)
         NotificationDismissalState.getInstance().dismissNotification(notificationId)
         wrapper.removeAll()
     }

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

@@ -5,9 +5,9 @@ package software.aws.toolkits.jetbrains.core.notifications
 
 import com.intellij.openapi.components.PersistentStateComponent
 import com.intellij.openapi.components.RoamingType
+import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
-import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 
 @Service
@@ -65,3 +65,23 @@ class NotificationEtagState : PersistentStateComponent<NotificationEtagConfigura
 data class NotificationEtagConfiguration(
     var etag: String? = null,
 )
+
+@Service
+class BannerNotificationService {
+    private val notifications = mutableMapOf<String, BannerContent>()
+
+    fun addNotification(id: String, content: BannerContent) {
+        notifications[id] = content
+    }
+
+    fun getNotifications(): Map<String, BannerContent> = notifications
+
+    fun removeNotification(id: String) {
+        notifications.remove(id)
+    }
+
+    companion object {
+        fun getInstance(): BannerNotificationService =
+            service()
+    }
+}

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

@@ -83,7 +83,7 @@ class ProcessNotificationsBase(
             )
             if (severity == "Critical") {
                 val bannerContent = BannerContent(notificationContent.title, notificationContent.description, followupActions, notificationData.id)
-                showBannerNotification[notificationData.id] = bannerContent
+                BannerNotificationService.getInstance().addNotification(notificationData.id, bannerContent)
                 notifyListenerForNotification(bannerContent)
             }
         }
@@ -107,7 +107,6 @@ class ProcessNotificationsBase(
     companion object {
         fun getInstance(project: Project): ProcessNotificationsBase = project.service()
 
-        val showBannerNotification = mutableMapOf<String, BannerContent>()
         private const val NOTIFICATIONS_PATH = "aws-static-resources/notifications.json"
     }
 }

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/utils/NotificationUtils.kt

@@ -17,8 +17,8 @@ import com.intellij.ui.ScrollPaneFactory
 import org.slf4j.LoggerFactory
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.help.HelpIds
+import software.aws.toolkits.jetbrains.core.notifications.BannerNotificationService
 import software.aws.toolkits.jetbrains.core.notifications.NotificationDismissalState
-import software.aws.toolkits.jetbrains.core.notifications.ProcessNotificationsBase
 import software.aws.toolkits.resources.AwsCoreBundle
 import javax.swing.JLabel
 import javax.swing.JTextArea
@@ -67,7 +67,7 @@ fun notifyStickyWithData(
         createNotificationExpiringAction(
             object : AnAction("Dismiss") {
                 override fun actionPerformed(e: AnActionEvent) {
-                    ProcessNotificationsBase.showBannerNotification.remove(id)
+                    BannerNotificationService.getInstance().removeNotification(id)
                     NotificationDismissalState.getInstance().dismissNotification(id)
                 }
             }