Get rid of KFunction

Arkadii Ivanov · Arkadii Ivanov · commit 10f182b22a7c · 2018-07-10T18:03:24.000+01:00
diff --git a/mvidroid/build.gradle b/mvidroid/build.gradle
@@ -24,7 +24,6 @@ dependencies {
     implementation "com.android.support:appcompat-v7:$support_library_version"
     implementation 'android.arch.lifecycle:common-java8:1.1.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    api 'com.github.arkivanov:kfunction:1.0.0'
     api 'io.reactivex.rxjava2:rxandroid:2.0.2'
     api 'com.jakewharton.rxrelay2:rxrelay:2.0.0'
     testImplementation 'junit:junit:4.12'
diff --git a/mvidroid/src/main/java/com/arkivanov/mvidroid/component/MviComponent.kt b/mvidroid/src/main/java/com/arkivanov/mvidroid/component/MviComponent.kt
@@ -1,7 +1,6 @@
 package com.arkivanov.mvidroid.component
 
 import android.support.annotation.MainThread
-import com.arkivanov.kfunction.KConsumer
 import io.reactivex.disposables.Disposable
 
 /**
@@ -15,7 +14,7 @@ import io.reactivex.disposables.Disposable
  * @param UiEvent type of UI Events
  * @param States type of States, typically includes States from all Component's Stores
  */
-interface MviComponent<in UiEvent : Any, out States : Any> : KConsumer<UiEvent>, Disposable {
+interface MviComponent<in UiEvent : Any, out States : Any> : (UiEvent) -> Unit, Disposable {
 
     /**
      * A group of States of Component's Stores. Must be accessed only from Main thread.
diff --git a/mvidroid/src/main/java/com/arkivanov/mvidroid/component/MviStoreBundle.kt b/mvidroid/src/main/java/com/arkivanov/mvidroid/component/MviStoreBundle.kt
@@ -1,6 +1,5 @@
 package com.arkivanov.mvidroid.component
 
-import com.arkivanov.kfunction.KFunction
 import com.arkivanov.mvidroid.store.MviStore
 
 /**
@@ -15,7 +14,7 @@ import com.arkivanov.mvidroid.store.MviStore
  */
 class MviStoreBundle<Intent : Any, in UiEvent : Any>(
     val store: MviStore<*, Intent, *>,
-    val uiEventTransformer: KFunction<UiEvent, Intent?>? = null,
-    val labelTransformer: KFunction<Any, Intent?>? = null,
+    val uiEventTransformer: ((UiEvent) -> Intent?)? = null,
+    val labelTransformer: ((Any) -> Intent?)? = null,
     val isPersistent: Boolean = false
 )
diff --git a/mvidroid/src/main/java/com/arkivanov/mvidroid/store/MviDefaultStore.kt b/mvidroid/src/main/java/com/arkivanov/mvidroid/store/MviDefaultStore.kt
@@ -1,7 +1,6 @@
 package com.arkivanov.mvidroid.store
 
 import android.support.annotation.MainThread
-import com.arkivanov.kfunction.KFunction
 import com.arkivanov.mvidroid.store.component.MviBootstrapper
 import com.arkivanov.mvidroid.store.component.MviExecutor
 import com.arkivanov.mvidroid.store.component.MviReducer
@@ -15,7 +14,7 @@ internal class MviDefaultStore<State : Any, in Intent : Any, Action : Any, out R
 @MainThread constructor(
     initialState: State,
     bootstrapper: MviBootstrapper<Action>? = null,
-    private val intentToAction: KFunction<Intent, Action>,
+    private val intentToAction: (Intent) -> Action,
     private val executor: MviExecutor<State, Action, Result, Label>,
     reducer: MviReducer<State, Result>
 ) : MviStore<State, Intent, Label> {
diff --git a/mvidroid/src/main/java/com/arkivanov/mvidroid/store/MviStore.kt b/mvidroid/src/main/java/com/arkivanov/mvidroid/store/MviStore.kt
@@ -1,7 +1,6 @@
 package com.arkivanov.mvidroid.store
 
 import android.support.annotation.MainThread
-import com.arkivanov.kfunction.KConsumer
 import io.reactivex.Observable
 import io.reactivex.disposables.Disposable
 
@@ -14,7 +13,7 @@ import io.reactivex.disposables.Disposable
  * @param Intent Type of Intent. Intent is a call to action, it triggers some Action in Store.
  * @param Label Type of Label. Labels are used for inter-Store communication.
  */
-interface MviStore<State : Any, in Intent : Any, Label : Any> : KConsumer<Intent>, Disposable {
+interface MviStore<State : Any, in Intent : Any, Label : Any> : (Intent) -> Unit, Disposable {
 
     /**
      * Provides access to current state, must be accessed only from Main thread
diff --git a/mvidroid/src/main/java/com/arkivanov/mvidroid/store/component/MviBootstrapper.kt b/mvidroid/src/main/java/com/arkivanov/mvidroid/store/component/MviBootstrapper.kt
@@ -1,7 +1,6 @@
 package com.arkivanov.mvidroid.store.component
 
 import android.support.annotation.MainThread
-import com.arkivanov.kfunction.KConsumer
 import io.reactivex.disposables.Disposable
 
 /**
@@ -19,5 +18,5 @@ interface MviBootstrapper<out Action : Any> {
      * This Disposable will be managed by Store.
      */
     @MainThread
-    fun bootstrap(dispatch: KConsumer<Action>): Disposable?
+    fun bootstrap(dispatch: (Action) -> Unit): Disposable?
 }
diff --git a/mvidroid/src/main/java/com/arkivanov/mvidroid/store/component/MviExecutor.kt b/mvidroid/src/main/java/com/arkivanov/mvidroid/store/component/MviExecutor.kt
@@ -1,8 +1,6 @@
 package com.arkivanov.mvidroid.store.component
 
 import android.support.annotation.MainThread
-import com.arkivanov.kfunction.KConsumer
-import com.arkivanov.kfunction.KSupplier
 import io.reactivex.disposables.Disposable
 
 /**
@@ -13,9 +11,9 @@ import io.reactivex.disposables.Disposable
 abstract class MviExecutor<State : Any, in Action : Any, Result : Any, Label : Any> @MainThread constructor() {
 
     private var isInitialized: Boolean = false
-    private lateinit var stateSupplier: KSupplier<State>
-    private lateinit var resultConsumer: KConsumer<Result>
-    private lateinit var labelConsumer: KConsumer<Label>
+    private lateinit var stateSupplier: () -> State
+    private lateinit var resultConsumer: (Result) -> Unit
+    private lateinit var labelConsumer: (Label) -> Unit
 
     /**
      * Provides current State of Store, must be accessed only on Main thread
@@ -29,7 +27,7 @@ abstract class MviExecutor<State : Any, in Action : Any, Result : Any, Label : A
      * Called internally by Store
      */
     @MainThread
-    fun init(stateSupplier: KSupplier<State>, resultConsumer: KConsumer<Result>, labelConsumer: KConsumer<Label>) {
+    fun init(stateSupplier: () -> State, resultConsumer: (Result) -> Unit, labelConsumer: (Label) -> Unit) {
         if (isInitialized) {
             throw IllegalStateException("MviExecutor cannot be reused, please make sure that it is not a singleton")
         }
diff --git a/mvidroid/src/main/java/com/arkivanov/mvidroid/store/component/MviSimpleBootstrapper.kt b/mvidroid/src/main/java/com/arkivanov/mvidroid/store/component/MviSimpleBootstrapper.kt
@@ -1,14 +1,13 @@
 package com.arkivanov.mvidroid.store.component
 
-import com.arkivanov.kfunction.KConsumer
 import io.reactivex.disposables.Disposable
 
 /**
  * Simple implementation of [MviBootstrapper] which immediately dispatches the provided Actions one by one
  */
 class MviSimpleBootstrapper<out Action : Any>(private vararg val actions: Action) : MviBootstrapper<Action> {
 
-    override fun bootstrap(dispatch: KConsumer<Action>): Disposable? {
+    override fun bootstrap(dispatch: (Action) -> Unit): Disposable? {
         actions.forEach(dispatch)
         return null
     }
diff --git a/mvidroid/src/main/java/com/arkivanov/mvidroid/store/factory/MviDefaultStoreFactory.kt b/mvidroid/src/main/java/com/arkivanov/mvidroid/store/factory/MviDefaultStoreFactory.kt
@@ -1,6 +1,5 @@
 package com.arkivanov.mvidroid.store.factory
 
-import com.arkivanov.kfunction.KFunction
 import com.arkivanov.mvidroid.store.MviDefaultStore
 import com.arkivanov.mvidroid.store.MviStore
 import com.arkivanov.mvidroid.store.component.MviBootstrapper
@@ -18,9 +17,9 @@ object MviDefaultStoreFactory : MviStoreFactory {
             override fun Nothing.reduce(result: Any): Nothing = this
         }
 
-    private val NO_OP_INTENT_TO_ACTION: KFunction<Nothing, Any> = { throw UnsupportedOperationException("WTF?") }
+    private val NO_OP_INTENT_TO_ACTION: (Nothing) -> Any = { throw UnsupportedOperationException("WTF?") }
 
-    private val BYPASS_INTENT_TO_ACTION: KFunction<Any, Any> = { it }
+    private val BYPASS_INTENT_TO_ACTION: (Any) -> Any = { it }
 
     private val BYPASS_EXECUTOR =
         object : MviExecutor<Any, Any, Any, Any>() {
@@ -34,10 +33,10 @@ object MviDefaultStoreFactory : MviStoreFactory {
     private fun <State : Any, Result : Any> getBypassReducer(): MviReducer<State, Result> = BYPASS_REDUCER as MviReducer<State, Result>
 
     @Suppress("UNCHECKED_CAST")
-    private fun <Action : Any> getNoOpIntentToAction(): KFunction<Nothing, Action> = NO_OP_INTENT_TO_ACTION as KFunction<Nothing, Action>
+    private fun <Action : Any> getNoOpIntentToAction(): (Nothing) -> Action = NO_OP_INTENT_TO_ACTION as (Nothing) -> Action
 
     @Suppress("UNCHECKED_CAST")
-    private fun <Intent : Any> getBypassIntentToAction(): KFunction<Intent, Intent> = BYPASS_INTENT_TO_ACTION as KFunction<Intent, Intent>
+    private fun <Intent : Any> getBypassIntentToAction(): (Intent) -> Intent = BYPASS_INTENT_TO_ACTION as (Intent) -> Intent
 
     @Suppress("UNCHECKED_CAST")
     private fun <State : Any, Intent : Any, Label : Any> getBypassExecutor(): MviExecutor<State, Intent, Intent, Label> =
@@ -46,7 +45,7 @@ object MviDefaultStoreFactory : MviStoreFactory {
     override fun <State : Any, Intent : Any, Action : Any, Result : Any, Label : Any> create(
         initialState: State,
         bootstrapper: MviBootstrapper<Action>?,
-        intentToAction: KFunction<Intent, Action>,
+        intentToAction: (Intent) -> Action,
         executor: MviExecutor<State, Action, Result, Label>,
         reducer: MviReducer<State, Result>?
     ): MviStore<State, Intent, Label> =
diff --git a/mvidroid/src/main/java/com/arkivanov/mvidroid/store/factory/MviStoreFactory.kt b/mvidroid/src/main/java/com/arkivanov/mvidroid/store/factory/MviStoreFactory.kt
@@ -1,7 +1,6 @@
 package com.arkivanov.mvidroid.store.factory
 
 import android.support.annotation.MainThread
-import com.arkivanov.kfunction.KFunction
 import com.arkivanov.mvidroid.store.MviStore
 import com.arkivanov.mvidroid.store.component.MviBootstrapper
 import com.arkivanov.mvidroid.store.component.MviExecutor
@@ -33,7 +32,7 @@ interface MviStoreFactory {
     fun <State : Any, Intent : Any, Action : Any, Result : Any, Label : Any> create(
         initialState: State,
         bootstrapper: MviBootstrapper<Action>? = null,
-        intentToAction: KFunction<Intent, Action>,
+        intentToAction: (Intent) -> Action,
         executor: MviExecutor<State, Action, Result, Label>,
         reducer: MviReducer<State, Result>? = null
     ): MviStore<State, Intent, Label>
diff --git a/mvidroid/src/main/java/com/arkivanov/mvidroid/utils/Utils.kt b/mvidroid/src/main/java/com/arkivanov/mvidroid/utils/Utils.kt
@@ -1,6 +1,5 @@
 package com.arkivanov.mvidroid.utils
 
-import com.arkivanov.kfunction.KFunction
 import io.reactivex.Maybe
 import io.reactivex.Observable
 import io.reactivex.ObservableSource
@@ -14,5 +13,5 @@ import io.reactivex.ObservableSource
  * @param R output type
  * @return an Observable that emits only non-null items transformed by the specified function from the source ObservableSource
  */
-inline fun <T : Any, R : Any> ObservableSource<out T>.mapNotNull(crossinline mapper: KFunction<T, R?>): Observable<R> =
+inline fun <T : Any, R : Any> ObservableSource<out T>.mapNotNull(crossinline mapper: (T) -> R?): Observable<R> =
     Observable.wrap(this).flatMapMaybe { mapper(it)?.let { Maybe.just(it) } ?: Maybe.empty() }
diff --git a/mvidroid/src/test/java/com/arkivanov/mvidroid/component/MviAbstractComponentTest.kt b/mvidroid/src/test/java/com/arkivanov/mvidroid/component/MviAbstractComponentTest.kt
@@ -1,6 +1,5 @@
 package com.arkivanov.mvidroid.component
 
-import com.arkivanov.kfunction.KFunction
 import com.arkivanov.mvidroid.store.MviStore
 import com.jakewharton.rxrelay2.PublishRelay
 import com.nhaarman.mockito_kotlin.mock
@@ -41,7 +40,7 @@ class MviAbstractComponentTest {
 
     @Test
     fun `intent received by store WHEN event transformer provided AND event published`() {
-        val transformer: KFunction<String, String> = mock {
+        val transformer: (String) -> String = mock {
             on { invoke("event") }.thenReturn("intent")
         }
         TestComponent(eventTransformer = transformer)("event")
@@ -50,7 +49,7 @@ class MviAbstractComponentTest {
 
     @Test
     fun `intent received by store WHEN label transformer provided AND label published`() {
-        val transformer: KFunction<Any, String> = mock {
+        val transformer: (Any) -> String = mock {
             on { invoke("label") }.thenReturn("intent")
         }
         TestComponent(labelTransformer = transformer)
@@ -74,8 +73,8 @@ class MviAbstractComponentTest {
     }
 
     private inner class TestComponent(
-        eventTransformer: KFunction<String, String?>? = null,
-        labelTransformer: KFunction<Any, String?>? = null,
+        eventTransformer: ((String) -> String?)? = null,
+        labelTransformer: ((Any) -> String?)? = null,
         isPersistent: Boolean = false
     ) : MviAbstractComponent<String, String>(listOf(MviStoreBundle(store, eventTransformer, labelTransformer, isPersistent)), labels) {
         override val states: String
diff --git a/mvidroid/src/test/java/com/arkivanov/mvidroid/store/MviDefaultStoreTest.kt b/mvidroid/src/test/java/com/arkivanov/mvidroid/store/MviDefaultStoreTest.kt
@@ -1,7 +1,5 @@
 package com.arkivanov.mvidroid.store
 
-import com.arkivanov.kfunction.KConsumer
-import com.arkivanov.kfunction.KSupplier
 import com.arkivanov.mvidroid.store.component.MviBootstrapper
 import com.arkivanov.mvidroid.store.component.MviExecutor
 import com.arkivanov.mvidroid.store.component.MviReducer
@@ -132,16 +130,16 @@ internal class MviDefaultStoreTest {
         return store
     }
 
-    private fun mockBootstrapper(onBootstrap: (dispatch: KConsumer<String>) -> Disposable?): MviBootstrapper<String> =
+    private fun mockBootstrapper(onBootstrap: (dispatch: (String) -> Unit) -> Disposable?): MviBootstrapper<String> =
         mock {
             on { bootstrap(any()) }.thenAnswer { onBootstrap(it.getArgument(0)) }
         }
 
     private class ExecutorHolder(onInvoke: (ExecutorHolder.(label: String) -> Disposable?) = { _ -> null }) {
         var isInitialized: Boolean = false
-        lateinit var stateSupplier: KSupplier<String>
-        lateinit var resultConsumer: KConsumer<String>
-        lateinit var labelConsumer: KConsumer<String>
+        lateinit var stateSupplier: () -> String
+        lateinit var resultConsumer: (String) -> Unit
+        lateinit var labelConsumer: (String) -> Unit
 
         val executor = mock<MviExecutor<String, String, String, String>> {
             on { init(any(), any(), any()) }.thenAnswer {
