Merge pull request #164 from arkivanov/rename-InstanceKeeper-getOrCreate-to-get

Renamed InstanceKeeper getOrCreate to get

Author: arkivanov

keepers/src/androidTest/kotlin/com/arkivanov/mvikotlin/keepers/instancekeeper/AndroidInstanceKeeperTest.kt

@@ -15,9 +15,9 @@ class AndroidInstanceKeeperTest {
     fun retains_instance_WHEN_recreated() {
         val viewModelStore = ViewModelStore()
         val instance = Data()
-        Owner(viewModelStore).keeper.getOrCreate(key = "data") { instance }
+        Owner(viewModelStore).keeper.get(key = "data") { instance }
 
-        val retainedInstance = Owner(viewModelStore).keeper.getOrCreate<Data>(key = "data") { throw IllegalStateException() }
+        val retainedInstance = Owner(viewModelStore).keeper.get<Data>(key = "data") { throw IllegalStateException() }
 
         assertSame(instance, retainedInstance)
     }
@@ -29,7 +29,7 @@ class AndroidInstanceKeeperTest {
         val instances = List(10) { Data() }
 
         instances.forEachIndexed { index, data ->
-            owner.keeper.getOrCreate(index) { data }
+            owner.keeper.get(index) { data }
         }
 
         viewModelStore.clear()

keepers/src/commonMain/kotlin/com/arkivanov/mvikotlin/keepers/instancekeeper/DefaultInstanceKeeper.kt

@@ -15,7 +15,7 @@ class DefaultInstanceKeeper : InstanceKeeper {
     private val map = HashMap<Any, InstanceKeeper.Instance>()
 
     @Suppress("UNCHECKED_CAST")
-    override fun <T : InstanceKeeper.Instance> getOrCreate(key: Any, factory: () -> T): T =
+    override fun <T : InstanceKeeper.Instance> get(key: Any, factory: () -> T): T =
         map.getOrPut(key, factory) as T
 
     /**

keepers/src/commonMain/kotlin/com/arkivanov/mvikotlin/keepers/instancekeeper/InstanceKeeper.kt

@@ -13,7 +13,7 @@ interface InstanceKeeper {
      * @param factory a factory function, called when there is no retained `Instance` yet
      * @return either a currently retained `Instance` or a new one
      */
-    fun <T : Instance> getOrCreate(key: Any, factory: () -> T): T
+    fun <T : Instance> get(key: Any, factory: () -> T): T
 
     /**
      * Represents a retained instance

keepers/src/commonMain/kotlin/com/arkivanov/mvikotlin/keepers/instancekeeper/InstanceKeeperExt.kt

@@ -1,8 +1,7 @@
 package com.arkivanov.mvikotlin.keepers.instancekeeper
 
 /**
- * Same as [InstanceKeeper.getOrCreate] but the key is `T::class`
+ * Same as [InstanceKeeper.get] but the key is `T::class`
  */
 @ExperimentalInstanceKeeperApi
-inline fun <reified T : InstanceKeeper.Instance> InstanceKeeper.getOrCreate(noinline factory: () -> T): T =
-    getOrCreate(T::class, factory)
+inline fun <reified T : InstanceKeeper.Instance> InstanceKeeper.get(noinline factory: () -> T): T = get(T::class, factory)

keepers/src/commonTest/kotlin/com/arkivanov/mvikotlin/keepers/instancekeeper/DefaultInstanceKeeperTest.kt

@@ -12,8 +12,8 @@ class DefaultInstanceKeeperTest {
         val container = DefaultInstanceKeeper()
         val data = Data()
 
-        container.getOrCreate(key = "data") { data }
-        val retainedData = container.getOrCreate<Data>(key = "data") { throw IllegalStateException() }
+        container.get(key = "data") { data }
+        val retainedData = container.get<Data>(key = "data") { throw IllegalStateException() }
 
         assertSame(data, retainedData)
     }
@@ -24,7 +24,7 @@ class DefaultInstanceKeeperTest {
         val dataList = List(10) { Data() }
 
         dataList.forEachIndexed { index, data ->
-            container.getOrCreate(index) { data }
+            container.get(index) { data }
         }
 
         container.destroy()

mvikotlin/src/commonMain/kotlin/com/arkivanov/mvikotlin/core/instancekeeper/InstanceKeeperExt.kt

@@ -40,16 +40,13 @@ fun <T : Store<*, *, *>> OldInstanceKeeper<T>.getOrCreateStore(factory: () -> T)
     }
 
 @com.arkivanov.mvikotlin.keepers.instancekeeper.ExperimentalInstanceKeeperApi
-fun <T : Store<*, *, *>> InstanceKeeper.getOrCreateStore(key: Any, factory: () -> T): T =
-    getOrCreate(key) {
+fun <T : Store<*, *, *>> InstanceKeeper.getStore(key: Any, factory: () -> T): T =
+    get(key) {
         StoreInstance(factory())
     }.store
 
 @com.arkivanov.mvikotlin.keepers.instancekeeper.ExperimentalInstanceKeeperApi
-inline fun <reified T : Store<*, *, *>> InstanceKeeper.getOrCreateStore(
-    noinline factory: () -> T
-): T =
-    getOrCreateStore(T::class, factory)
+inline fun <reified T : Store<*, *, *>> InstanceKeeper.getStore(noinline factory: () -> T): T = getStore(T::class, factory)
 
 @com.arkivanov.mvikotlin.keepers.instancekeeper.ExperimentalInstanceKeeperApi
 private class StoreInstance<out T : Store<*, *, *>>(

sample/todo-coroutines/src/commonMain/kotlin/com/arkivanov/mvikotlin/sample/todo/coroutines/controller/TodoListCoroutinesController.kt

@@ -1,7 +1,7 @@
 package com.arkivanov.mvikotlin.sample.todo.coroutines.controller
 
 import com.arkivanov.mvikotlin.core.binder.BinderLifecycleMode
-import com.arkivanov.mvikotlin.core.instancekeeper.getOrCreateStore
+import com.arkivanov.mvikotlin.core.instancekeeper.getStore
 import com.arkivanov.mvikotlin.core.lifecycle.Lifecycle
 import com.arkivanov.mvikotlin.core.lifecycle.doOnDestroy
 import com.arkivanov.mvikotlin.extensions.coroutines.bind
@@ -47,7 +47,7 @@ class TodoListCoroutinesController internal constructor(
     )
 
     private val todoListStore =
-        dependencies.instanceKeeper.getOrCreateStore {
+        dependencies.instanceKeeper.getStore {
             TodoListStoreFactory(
                 storeFactory = dependencies.storeFactory,
                 database = dependencies.database,

sample/todo-reaktive/src/commonMain/kotlin/com/arkivanov/mvikotlin/sample/todo/reaktive/controller/TodoListReaktiveController.kt

@@ -1,7 +1,7 @@
 package com.arkivanov.mvikotlin.sample.todo.reaktive.controller
 
 import com.arkivanov.mvikotlin.core.binder.BinderLifecycleMode
-import com.arkivanov.mvikotlin.core.instancekeeper.getOrCreateStore
+import com.arkivanov.mvikotlin.core.instancekeeper.getStore
 import com.arkivanov.mvikotlin.core.lifecycle.Lifecycle
 import com.arkivanov.mvikotlin.core.lifecycle.doOnDestroy
 import com.arkivanov.mvikotlin.extensions.reaktive.bind
@@ -31,7 +31,7 @@ class TodoListReaktiveController(
 ) : TodoListController {
 
     private val todoListStore =
-        dependencies.instanceKeeper.getOrCreateStore {
+        dependencies.instanceKeeper.getStore {
             TodoListStoreFactory(
                 storeFactory = dependencies.storeFactory,
                 database = dependencies.database