Made cache population suspendable

Author: manami-project

manami-app/src/main/kotlin/io/github/manamiproject/manami/app/Manami.kt

@@ -24,6 +24,7 @@ import io.github.manamiproject.modb.anilist.AnilistConfig
 import io.github.manamiproject.modb.core.logging.LoggerDelegate
 import io.github.manamiproject.modb.kitsu.KitsuConfig
 import io.github.manamiproject.modb.myanimelist.MyanimelistConfig
+import kotlinx.coroutines.runBlocking
 import java.net.URI
 import java.util.concurrent.Executors
 import java.util.concurrent.atomic.AtomicReference
@@ -85,8 +86,10 @@ class Manami(
 
 private val backgroundTasks = Executors.newCachedThreadPool()
 
-internal fun runInBackground(action: () -> Unit) {
+internal fun runInBackground(action: suspend () -> Unit) {
     backgroundTasks.submit {
-        action.invoke()
+        runBlocking {
+            action.invoke()
+        }
     }
 }

manami-app/src/main/kotlin/io/github/manamiproject/manami/app/cache/populator/AnimeCachePopulator.kt

@@ -11,7 +11,6 @@ import io.github.manamiproject.modb.serde.json.AnimeListJsonStringDeserializer
 import io.github.manamiproject.modb.serde.json.DefaultExternalResourceJsonDeserializer
 import io.github.manamiproject.modb.serde.json.ExternalResourceJsonDeserializer
 import io.github.manamiproject.modb.serde.json.models.Dataset
-import kotlinx.coroutines.runBlocking
 import java.net.URI
 
 internal class AnimeCachePopulator(
@@ -20,10 +19,10 @@ internal class AnimeCachePopulator(
     private val eventBus: EventBus = SimpleEventBus,
 ) : CachePopulator<URI, CacheEntry<Anime>> {
 
-    override fun populate(cache: Cache<URI, CacheEntry<Anime>>) {
+    override suspend fun populate(cache: Cache<URI, CacheEntry<Anime>>) {
         log.info {"Populating cache with anime from [$uri]." }
 
-        val parsedAnime = runBlocking { parser.deserialize(uri.toURL()).data }
+        val parsedAnime = parser.deserialize(uri.toURL()).data
 
         parsedAnime.forEach { anime ->
             anime.sources.forEach { source ->

manami-app/src/main/kotlin/io/github/manamiproject/manami/app/cache/populator/CachePopulator.kt

@@ -4,5 +4,5 @@ import io.github.manamiproject.manami.app.cache.Cache
 import io.github.manamiproject.manami.app.cache.CacheEntry
 
 internal interface CachePopulator<KEY, VALUE: CacheEntry<*>> {
-    fun populate(cache: Cache<KEY, VALUE>)
+    suspend fun populate(cache: Cache<KEY, VALUE>)
 }

manami-app/src/main/kotlin/io/github/manamiproject/manami/app/cache/populator/DeadEntriesCachePopulator.kt

@@ -20,7 +20,7 @@ internal class DeadEntriesCachePopulator(
     private val parser: ExternalResourceJsonDeserializer<DeadEntries> = DefaultExternalResourceJsonDeserializer(deserializer = DeadEntriesJsonStringDeserializer.instance),
 ) : CachePopulator<URI, CacheEntry<Anime>> {
 
-    override fun populate(cache: Cache<URI, CacheEntry<Anime>>) {
+    override suspend fun populate(cache: Cache<URI, CacheEntry<Anime>>) {
         log.info { "Populating cache with dead entries from [${config.hostname()}]" }
 
         runBlocking {

manami-app/src/test/kotlin/io/github/manamiproject/manami/app/cache/populator/AnimeCachePopulatorTest.kt

@@ -16,6 +16,7 @@ import io.github.manamiproject.modb.core.models.AnimeSeason.Season.FALL
 import io.github.manamiproject.modb.test.MockServerTestCase
 import io.github.manamiproject.modb.test.WireMockServerCreator
 import io.github.manamiproject.modb.test.loadTestResource
+import kotlinx.coroutines.runBlocking
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import java.net.URI
@@ -128,7 +129,9 @@ internal class AnimeCachePopulatorTest: MockServerTestCase<WireMockServer> by Wi
         )
 
         // when
-        animeCachePopulator.populate(testCache)
+        runBlocking {
+            animeCachePopulator.populate(testCache)
+        }
 
         // then
         val expectedAnidbEntry = expectedAnime.copy(

manami-app/src/test/kotlin/io/github/manamiproject/manami/app/cache/populator/DeadEntriesCachePopulatorTest.kt

@@ -11,6 +11,7 @@ import io.github.manamiproject.modb.core.config.Hostname
 import io.github.manamiproject.modb.core.config.MetaDataProviderConfig
 import io.github.manamiproject.modb.test.MockServerTestCase
 import io.github.manamiproject.modb.test.WireMockServerCreator
+import kotlinx.coroutines.runBlocking
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import java.net.URI
@@ -55,7 +56,9 @@ internal class DeadEntriesCachePopulatorTest: MockServerTestCase<WireMockServer>
         )
 
         // when
-        animeCachePopulator.populate(testCache)
+        runBlocking {
+            animeCachePopulator.populate(testCache)
+        }
 
         // then
         assertThat(testCache.fetch(URI("https://example.org/anime/12449"))).isInstanceOf(DeadEntry::class.java)