Merge branch 'samgst/notificationPolling' into samgst/notificationStates

Author: samgst-amazon

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

@@ -63,8 +63,7 @@ object NotificationEndpoint {
 @Service(Service.Level.APP)
 internal final class NotificationPollingService : Disposable {
     private val isFirstPoll = AtomicBoolean(true)
-    private val isStartup = AtomicBoolean(true)
-    private val observers = mutableListOf<(Boolean) -> Unit>()
+    private val observers = mutableListOf<() -> Unit>()
     private val alarm = AlarmFactory.getInstance().create(Alarm.ThreadToUse.POOLED_THREAD, this)
     private val scope = CoroutineScope(getCoroutineBgContext())
     private val pollingIntervalMs = Duration.ofMinutes(10).toMillis()
@@ -149,11 +148,11 @@ internal final class NotificationPollingService : Disposable {
         )
     }
 
-    fun addObserver(observer: (Boolean) -> Unit) = observers.add(observer)
+    fun addObserver(observer: () -> Unit) = observers.add(observer)
 
     private fun notifyObservers() {
         observers.forEach { observer ->
-            observer(isStartup.getAndSet(false))
+            observer()
         }
     }
 

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

@@ -26,7 +26,7 @@ class NotificationPollingServiceTest {
     private lateinit var sut: NotificationPollingService
     private lateinit var mockResolver: RemoteResourceResolver
     private lateinit var mockProvider: RemoteResourceResolverProvider
-    private lateinit var observer: (Boolean) -> Unit
+    private lateinit var observer: () -> Unit
     private val testPath = Path.of("/test/path")
 
     @BeforeEach
@@ -47,8 +47,8 @@ class NotificationPollingServiceTest {
         providerField.set(sut, mockProvider)
 
         // Create mock observers
-        observer = mockk<(Boolean) -> Unit>()
-        every { observer.invoke(any()) } just Runs
+        observer = mockk<() -> Unit>()
+        every { observer.invoke() } just Runs
 
         val observersField = NotificationPollingService::class.java
             .getDeclaredField("observers")
@@ -78,7 +78,7 @@ class NotificationPollingServiceTest {
             } returns "same"
             sut.startPolling()
         }
-        verify(exactly = 0) { observer.invoke(any()) }
+        verify(exactly = 0) { observer.invoke() }
     }
 
     @Test
@@ -92,7 +92,7 @@ class NotificationPollingServiceTest {
             } returns "same"
             sut.startPolling()
         }
-        verify(exactly = 1) { observer.invoke(any()) }
+        verify(exactly = 1) { observer.invoke() }
     }
 
     @Test
@@ -106,6 +106,6 @@ class NotificationPollingServiceTest {
             } returns "newEtag"
             sut.startPolling()
         }
-        verify(exactly = 1) { observer.invoke(any()) }
+        verify(exactly = 1) { observer.invoke() }
     }
 }