persistent state syntax

Author: samgst-amazon

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

@@ -41,7 +41,8 @@ enum class NotificationSeverity {
 
 enum class NotificationScheduleType {
     STARTUP,
-    EMERGENCY;
+    EMERGENCY,
+    ;
 
     companion object {
         fun fromString(value: String): NotificationScheduleType {

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

@@ -10,12 +10,13 @@ import com.intellij.openapi.components.Storage
 
 @State(name = "notificationDismissals", storages = [Storage("aws.xml")])
 class NotificationDismissalState : PersistentStateComponent<NotificationDismissalConfiguration> {
-    private var state = NotificationDismissalConfiguration()
+    private val state = NotificationDismissalConfiguration()
 
     override fun getState(): NotificationDismissalConfiguration = state
 
     override fun loadState(state: NotificationDismissalConfiguration) {
-        this.state = state
+        this.state.dismissedNotificationIds.clear()
+        this.state.dismissedNotificationIds.addAll(state.dismissedNotificationIds)
     }
 
     fun isDismissed(notificationId: String): Boolean =
@@ -37,12 +38,12 @@ data class NotificationDismissalConfiguration(
 
 @State(name = "notificationEtag", storages = [Storage("aws.xml")])
 class NotificationEtagState : PersistentStateComponent<NotificationEtagConfiguration> {
-    private var state = NotificationEtagConfiguration()
+    private val state = NotificationEtagConfiguration()
 
     override fun getState(): NotificationEtagConfiguration = state
 
     override fun loadState(state: NotificationEtagConfiguration) {
-        this.state = state
+        this.state.etag = state.etag
     }
 
     var etag: String?

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

@@ -44,7 +44,7 @@ class ProcessNotificationsBase(
     }
 
     fun retrieveStartupAndEmergencyNotifications() {
-        val isStartupPoll = isStartup.compareAndSet(true,false)
+        val isStartupPoll = isStartup.compareAndSet(true, false)
         val notifications = getNotificationsFromFile()
         notifications?.let { notificationsList ->
             val activeNotifications = notificationsList.notifications

plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/notifications/ProcessNotificationsBaseTest.kt

@@ -3,17 +3,17 @@
 
 package software.aws.toolkits.jetbrains.core.notifications
 
+import com.intellij.openapi.project.Project
+import com.intellij.testFramework.ApplicationExtension
 import io.mockk.every
 import io.mockk.mockk
+import io.mockk.mockkObject
 import io.mockk.spyk
-import io.mockk.verify
 import io.mockk.unmockkAll
-import io.mockk.mockkObject
+import io.mockk.verify
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import com.intellij.openapi.project.Project
-import com.intellij.testFramework.ApplicationExtension
 import org.junit.jupiter.api.extension.ExtendWith
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -34,7 +34,6 @@ class ProcessNotificationsBaseTest {
         sut = spyk<ProcessNotificationsBase>(
             objToCopy = ProcessNotificationsBase(project)
         )
-
     }
 
     @Test
@@ -81,7 +80,6 @@ class ProcessNotificationsBaseTest {
         // second poll skips processing
         sut.retrieveStartupAndEmergencyNotifications()
 
-
         verify(exactly = 1) { sut.processNotification(project, any()) }
     }
 
@@ -96,7 +94,7 @@ class ProcessNotificationsBaseTest {
 
     @Test
     fun `empty notifications list is handled gracefully`() {
-        every { sut["getNotificationsFromFile"]()} returns createNotificationsList()
+        every { sut["getNotificationsFromFile"]() } returns createNotificationsList()
 
         sut.retrieveStartupAndEmergencyNotifications()
 
@@ -128,7 +126,7 @@ class ProcessNotificationsBaseTest {
     }
 
     // Helper functions to create test data
-private fun createNotification(id: String, type: NotificationScheduleType) = NotificationData(
+    private fun createNotification(id: String, type: NotificationScheduleType) = NotificationData(
         id = id,
         schedule = NotificationSchedule(type = type),
         severity = "INFO",
@@ -156,8 +154,6 @@ private fun createNotification(id: String, type: NotificationScheduleType) = Not
         value.set(true)
     }
 
-
-
     @AfterEach
     fun tearDown() {
         unmockkAll()