Make MapInfoDao accept collection instead of vararg

TimPushkin · Aug 20, 2022 · 36ed3ce · 36ed3ce
1 parent 163287b
commit 36ed3ce
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/src/androidTest/java/ru/spbu/depnav/data/db/AppDatabaseDaosTest.kt b/app/src/androidTest/java/ru/spbu/depnav/data/db/AppDatabaseDaosTest.kt
@@ -66,7 +66,7 @@ class AppDatabaseDaosTest {
             MapInfo("abc", 100, 100, 1024, 1, 5),
             MapInfo("cba", 100, 200, 512, 2, 100)
         )
-        runBlocking { mapInfoDao.insertAll(*expected.toTypedArray()) }
+        runBlocking { mapInfoDao.insertAll(expected) }
 
         val actual = runBlocking {
             listOf(

diff --git a/app/src/main/java/ru/spbu/depnav/data/db/MapInfoDao.kt b/app/src/main/java/ru/spbu/depnav/data/db/MapInfoDao.kt
@@ -28,7 +28,7 @@ import ru.spbu.depnav.data.model.MapInfo
 interface MapInfoDao {
     /** Inserts the provided [MapInfo] entries into the database. */
     @Insert
-    suspend fun insertAll(vararg mapInfos: MapInfo)
+    suspend fun insertAll(mapInfos: Collection<MapInfo>)
 
     /** Returns a [MapInfo] with the provided map name. */
     @Query("SELECT * FROM map_infos WHERE map_name = :name")

diff --git a/app/src/main/java/ru/spbu/depnav/data/repository/MapInfoRepo.kt b/app/src/main/java/ru/spbu/depnav/data/repository/MapInfoRepo.kt
@@ -25,7 +25,7 @@ import javax.inject.Inject
 /** Repository for loading and saving [MapInfo] objects. */
 class MapInfoRepo @Inject constructor(private val dao: MapInfoDao) {
     /** Saves the provided objects. */
-    suspend fun insertAll(vararg mapInfos: MapInfo) = dao.insertAll(*mapInfos)
+    suspend fun insertAll(mapInfos: Collection<MapInfo>) = dao.insertAll(mapInfos)
 
     /** Loads a [MapInfo] by its name. */
     suspend fun loadByName(name: String) = dao.loadByName(name)