From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 11 Dec 2019 18:46:11 +0000 (+0100)
Subject: ♻️ Move startup notification into handler
X-Git-Tag: v81^2~5^2~40
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=5cfe9916e6b52b68a403873e35683ce242be4793;p=Sone.git

♻️ Move startup notification into handler
---

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index cefbfa9..8e21ea5 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -411,19 +411,6 @@ public class WebInterface implements SessionProvider {
 		registerToadlets();
 
 		/* notification templates. */
-		Template startupNotificationTemplate = loaders.loadTemplate("/templates/notify/startupNotification.html");
-
-		final TemplateNotification startupNotification = new TemplateNotification("startup-notification", startupNotificationTemplate);
-		notificationManager.addNotification(startupNotification);
-
-		ticker.schedule(new Runnable() {
-
-			@Override
-			public void run() {
-				startupNotification.dismiss();
-			}
-		}, 2, TimeUnit.MINUTES);
-
 		Template wotMissingNotificationTemplate = loaders.loadTemplate("/templates/notify/wotMissingNotification.html");
 		final TemplateNotification wotMissingNotification = new TemplateNotification("wot-missing-notification", wotMissingNotificationTemplate);
 		ticker.scheduleAtFixedRate(new Runnable() {
diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandler.kt
index dc60079..41e67bd 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandler.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandler.kt
@@ -33,5 +33,6 @@ class NotificationHandler @Inject constructor(
 		newVersionHandler: NewVersionHandler,
 		imageInsertHandler: ImageInsertHandler,
 		firstStartHandler: FirstStartHandler,
-		configNotReadHandler: ConfigNotReadHandler
+		configNotReadHandler: ConfigNotReadHandler,
+		startupHandler: StartupHandler
 )
diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModule.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModule.kt
index e94be5b..539f001 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModule.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModule.kt
@@ -47,6 +47,7 @@ class NotificationHandlerModule : AbstractModule() {
 		bind<ImageInsertHandler>().asSingleton()
 		bind<FirstStartHandler>().asSingleton()
 		bind<ConfigNotReadHandler>().asSingleton()
+		bind<StartupHandler>().asSingleton()
 	}
 
 	@Provides
@@ -121,6 +122,12 @@ class NotificationHandlerModule : AbstractModule() {
 	fun getConfigNotReadNotification(loaders: Loaders) =
 			TemplateNotification("config-not-read-notification", loaders.loadTemplate("/templates/notify/configNotReadNotification.html"))
 
+	@Provides
+	@Singleton
+	@Named("startup")
+	fun getStartupNotification(loaders: Loaders) =
+			TemplateNotification("startup-notification", loaders.loadTemplate("/templates/notify/startupNotification.html"))
+
 	private inline fun <reified T> bind(): AnnotatedBindingBuilder<T> = bind(T::class.java)
 	private fun ScopedBindingBuilder.asSingleton() = `in`(Singleton::class.java)
 
diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/StartupHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/StartupHandler.kt
index 392aa5c..c3b69f0 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/notification/StartupHandler.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/StartupHandler.kt
@@ -22,11 +22,15 @@ import net.pterodactylus.sone.core.event.*
 import net.pterodactylus.util.notify.*
 import java.util.concurrent.*
 import java.util.concurrent.TimeUnit.*
+import javax.inject.*
 
 /**
  * Handler for the [Startup] event notification.
  */
-class StartupHandler(private val notificationManager: NotificationManager, private val notification: TemplateNotification, val ticker: ScheduledExecutorService) {
+class StartupHandler @Inject constructor(
+		private val notificationManager: NotificationManager,
+		@Named("startup") private val notification: TemplateNotification,
+		private val ticker: ScheduledExecutorService) {
 
 	@Subscribe
 	fun startup(startup: Startup) {
diff --git a/src/test/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModuleTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModuleTest.kt
index a061230..477e6e3 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModuleTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModuleTest.kt
@@ -370,4 +370,31 @@ class NotificationHandlerModuleTest {
 		injector.verifySingletonInstance<ConfigNotReadHandler>()
 	}
 
+	@Test
+	fun `startup notification can be created`() {
+		injector.verifySingletonInstance<TemplateNotification>(named("startup"))
+	}
+
+	@Test
+	fun `startup notification has correct ID`() {
+		assertThat(injector.getInstance<TemplateNotification>(named("startup")).id, equalTo("startup-notification"))
+	}
+
+	@Test
+	fun `startup notification is dismissable`() {
+		assertThat(injector.getInstance<TemplateNotification>(named("startup")).isDismissable, equalTo(true))
+	}
+
+	@Test
+	fun `startup notification loads correct template`() {
+		loaders.templates += "/templates/notify/startupNotification.html" to "1".asTemplate()
+		val notification = injector.getInstance<TemplateNotification>(named("startup"))
+		assertThat(notification.render(), equalTo("1"))
+	}
+
+	@Test
+	fun `startup handler is created as singleton`() {
+		injector.verifySingletonInstance<StartupHandler>()
+	}
+
 }