X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fnotification%2FNotificationHandlerModule.kt;h=4737267b1a82a95ea9f6712bab0f7f9f794b952b;hp=7571f67c2fe1ad346491981d2b63cf81f2e2e557;hb=069a5d8f4a6d7569e6ecd66ba2a57a3fd4db582f;hpb=bfa49c59a39fddd8bed21bdac98d8bd21e8cb525 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 7571f67..4737267 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModule.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModule.kt @@ -18,12 +18,14 @@ package net.pterodactylus.sone.web.notification import com.google.inject.* +import com.google.inject.binder.* import net.pterodactylus.sone.core.* import net.pterodactylus.sone.data.* import net.pterodactylus.sone.main.* import net.pterodactylus.sone.notify.* import net.pterodactylus.util.notify.* import java.util.concurrent.Executors.* +import java.util.function.* import javax.inject.* import javax.inject.Singleton @@ -34,12 +36,11 @@ class NotificationHandlerModule : AbstractModule() { override fun configure() { bind(NotificationHandler::class.java).`in`(Singleton::class.java) + bind().asSingleton() } @Provides - @Singleton - fun getMarkPostKnownDuringFirstStartHandler(core: Core, notificationManager: NotificationManager) = - MarkPostKnownDuringFirstStartHandler(notificationManager, core::markPostKnown) + fun getMarkPostKnownHandler(core: Core): Consumer = Consumer { core.markPostKnown(it) } @Provides @Singleton @@ -84,4 +85,7 @@ class NotificationHandlerModule : AbstractModule() { fun getSoneLockedHandler(notificationManager: NotificationManager, @Named("soneLocked") soneLockedNotification: ListNotification) = SoneLockedHandler(notificationManager, soneLockedNotification, newScheduledThreadPool(1)) + private inline fun bind(): AnnotatedBindingBuilder = bind(T::class.java) + private fun ScopedBindingBuilder.asSingleton() = `in`(Singleton::class.java) + }