From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 11 Dec 2019 21:03:56 +0000 (+0100)
Subject: 🎨 Use Runnable instead of a Kotlin arrow type
X-Git-Tag: v81^2~5^2~37
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=b385551aaa0750cb0041858037cd83dcbf9006b6;p=Sone.git

🎨 Use Runnable instead of a Kotlin arrow type
---

diff --git a/src/main/kotlin/net/pterodactylus/sone/freenet/wot/WebOfTrustPinger.kt b/src/main/kotlin/net/pterodactylus/sone/freenet/wot/WebOfTrustPinger.kt
index e090133..9d0522d 100644
--- a/src/main/kotlin/net/pterodactylus/sone/freenet/wot/WebOfTrustPinger.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/freenet/wot/WebOfTrustPinger.kt
@@ -20,14 +20,19 @@ package net.pterodactylus.sone.freenet.wot
 import com.google.common.eventbus.*
 import net.pterodactylus.sone.core.event.*
 import net.pterodactylus.sone.freenet.plugin.*
+import net.pterodactylus.sone.utils.*
 import java.util.concurrent.atomic.*
+import javax.inject.*
 
 /**
  * [Runnable] that is scheduled via an [Executor][java.util.concurrent.Executor],
  * checks whether the web of trust plugin can be communicated with, sends
  * events if its status changes and reschedules itself.
  */
-class WebOfTrustPinger(private val eventBus: EventBus, private val webOfTrustReacher: () -> Unit, private val reschedule: () -> Unit) : Runnable {
+class WebOfTrustPinger @Inject constructor(
+		private val eventBus: EventBus,
+		@Named("webOfTrustReacher") private val webOfTrustReacher: Runnable,
+		@Named("webOfTrustReschedule") private val reschedule: Runnable) : Runnable {
 
 	private val lastState = AtomicBoolean(false)
 
diff --git a/src/test/kotlin/net/pterodactylus/sone/freenet/wot/WebOfTrustPingerTest.kt b/src/test/kotlin/net/pterodactylus/sone/freenet/wot/WebOfTrustPingerTest.kt
index 894b9ef..9743449 100644
--- a/src/test/kotlin/net/pterodactylus/sone/freenet/wot/WebOfTrustPingerTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/freenet/wot/WebOfTrustPingerTest.kt
@@ -33,9 +33,9 @@ class WebOfTrustPingerTest {
 
 	private val eventBus = EventBus()
 	private val webOfTrustReachable = AtomicBoolean()
-	private val webOfTrustReacher: () -> Unit = { webOfTrustReachable.get().onFalse { throw PluginException() } }
+	private val webOfTrustReacher = Runnable { webOfTrustReachable.get().onFalse { throw PluginException() } }
 	private val rescheduled = AtomicBoolean()
-	private val reschedule: () -> Unit = { rescheduled.set(true) }
+	private val reschedule = Runnable { rescheduled.set(true) }
 	private val pinger = WebOfTrustPinger(eventBus, webOfTrustReacher, reschedule)
 
 	@Test