Rename KeyProvider methods

MobileNativeFoundation · Dec 8, 2023 · b362b10 · b362b10
1 parent 4d56511
commit b362b10
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/cache/src/commonMain/kotlin/org/mobilenativefoundation/store/cache5/StoreMultiCache.kt b/cache/src/commonMain/kotlin/org/mobilenativefoundation/store/cache5/StoreMultiCache.kt
@@ -109,7 +109,7 @@ class StoreMultiCache<Id : Any, Key : StoreKey<Id>, Single : StoreData.Single<Id
                 val single = value as Single
                 accessor.putSingle(key.castSingle(), single)
 
-                val collectionKey = keyProvider.from(key.castSingle(), single)
+                val collectionKey = keyProvider.fromSingle(key.castSingle(), single)
                 val existingCollection = accessor.getCollection(collectionKey)
                 if (existingCollection != null) {
                     val updatedItems = existingCollection.items.toMutableList().map {
@@ -131,7 +131,7 @@ class StoreMultiCache<Id : Any, Key : StoreKey<Id>, Single : StoreData.Single<Id
                 collection.items.forEach {
                     val single = it as? Single
                     if (single != null) {
-                        accessor.putSingle(keyProvider.from(key.castCollection(), single), single)
+                        accessor.putSingle(keyProvider.fromCollection(key.castCollection(), single), single)
                     }
                 }
             }

diff --git a/core/src/commonMain/kotlin/org/mobilenativefoundation/store/core5/KeyProvider.kt b/core/src/commonMain/kotlin/org/mobilenativefoundation/store/core5/KeyProvider.kt
@@ -1,6 +1,6 @@
 package org.mobilenativefoundation.store.core5
 
 interface KeyProvider<Id : Any, Single : StoreData.Single<Id>> {
-    fun from(key: StoreKey.Collection<Id>, value: Single): StoreKey.Single<Id>
-    fun from(key: StoreKey.Single<Id>, value: Single): StoreKey.Collection<Id>
+    fun fromCollection(key: StoreKey.Collection<Id>, value: Single): StoreKey.Single<Id>
+    fun fromSingle(key: StoreKey.Single<Id>, value: Single): StoreKey.Collection<Id>
 }
diff --git a/...g/src/commonTest/kotlin/org/mobilenativefoundation/store/paging5/util/PostStoreFactory.kt b/...g/src/commonTest/kotlin/org/mobilenativefoundation/store/paging5/util/PostStoreFactory.kt
@@ -4,10 +4,17 @@ package org.mobilenativefoundation.store.paging5.util
 
 import kotlinx.coroutines.flow.flow
 import org.mobilenativefoundation.store.cache5.Cache
-import org.mobilenativefoundation.store.core5.KeyProvider
 import org.mobilenativefoundation.store.cache5.StoreMultiCache
+import org.mobilenativefoundation.store.core5.KeyProvider
 import org.mobilenativefoundation.store.core5.StoreKey
-import org.mobilenativefoundation.store.store5.*
+import org.mobilenativefoundation.store.store5.Converter
+import org.mobilenativefoundation.store.store5.ExperimentalStoreApi
+import org.mobilenativefoundation.store.store5.Fetcher
+import org.mobilenativefoundation.store.store5.MutableStore
+import org.mobilenativefoundation.store.store5.SourceOfTruth
+import org.mobilenativefoundation.store.store5.StoreBuilder
+import org.mobilenativefoundation.store.store5.Updater
+import org.mobilenativefoundation.store.store5.UpdaterResult
 import kotlin.math.floor
 
 class PostStoreFactory(private val api: PostApi, private val db: PostDatabase) {
@@ -102,11 +109,14 @@ class PostStoreFactory(private val api: PostApi, private val db: PostDatabase) {
 
     private fun createPagingCacheKeyProvider(): KeyProvider<String, PostData.Post> =
         object : KeyProvider<String, PostData.Post> {
-            override fun from(key: StoreKey.Collection<String>, value: PostData.Post): StoreKey.Single<String> {
+            override fun fromCollection(
+                key: StoreKey.Collection<String>,
+                value: PostData.Post
+            ): StoreKey.Single<String> {
                 return PostKey.Single(value.postId)
             }
 
-            override fun from(key: StoreKey.Single<String>, value: PostData.Post): StoreKey.Collection<String> {
+            override fun fromSingle(key: StoreKey.Single<String>, value: PostData.Post): StoreKey.Collection<String> {
                 val id = value.postId.toInt()
                 val cursor = (floor(id.toDouble() / 10) * 10) + 1
                 return PostKey.Cursor(cursor.toInt().toString(), 10)