Merge pull request #96 from thefuntasty/feature/2-x-improve-flow

Improve FlowInteractor
futuredapp · Jan 7, 2020 · 7ef8e26 · 7ef8e26
2 parents be7caec + cc606a7
commit 7ef8e26
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/cr-interactors/src/main/java/com/thefuntasty/mvvm/crinteractors/BaseFlowInteractor.kt b/cr-interactors/src/main/java/com/thefuntasty/mvvm/crinteractors/BaseFlowInteractor.kt
@@ -9,12 +9,12 @@ import kotlinx.coroutines.flow.Flow
 abstract class BaseFlowInteractor<T> {
 
     /**
-     *  [Job] used to hold and cancel existing run of this interactor
+     * [Job] used to hold and cancel existing run of this interactor
      */
     var job: Job? = null
 
     /**
-     * Suspend function which should contain business logic
+     * Function which should contain business logic
      */
-    abstract suspend fun build(): Flow<T>
+    abstract fun build(): Flow<T>
 }
diff --git a/cr-interactors/src/main/java/com/thefuntasty/mvvm/crinteractors/CoroutineScopeOwner.kt b/cr-interactors/src/main/java/com/thefuntasty/mvvm/crinteractors/CoroutineScopeOwner.kt
@@ -5,11 +5,11 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
-import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 
 /**
@@ -73,22 +73,21 @@ interface CoroutineScopeOwner {
         onComplete: () -> Unit = {}
     ) {
         job?.cancel()
-        job = coroutineScope.launch(Dispatchers.Main) {
-            try {
-                build()
-                    .flowOn(getWorkerDispatcher())
-                    .onEach { onNext(it) }
-                    .onCompletion { error ->
-                        if (this@launch.isActive) {
-                            error?.also { onError?.invoke(it) ?: throw error } ?: onComplete()
-                        }
+        job = build()
+            .flowOn(getWorkerDispatcher())
+            .onEach { onNext(it) }
+            .onCompletion { error ->
+                when {
+                    error is CancellationException -> {
+                        // ignore this exception
                     }
-                    .collect()
-            } catch (cancellation: CancellationException) {
-                // do nothing this is normal way of suspend function interruption
-            } catch (error: Throwable) {
-                onError?.invoke(error) ?: throw error
+                    error != null -> {
+                        onError?.invoke(error) ?: throw error
+                    }
+                    else -> onComplete()
+                }
             }
-        }
+            .catch { /* handled in onCompletion */ }
+            .launchIn(coroutineScope)
     }
 }
diff --git a/cr-interactors/src/test/java/com/thefuntasty/mvvm/crinteractors/CoroutineScopeOwnerTest.kt b/cr-interactors/src/test/java/com/thefuntasty/mvvm/crinteractors/CoroutineScopeOwnerTest.kt
@@ -1,10 +1,10 @@
 package com.thefuntasty.mvvm.crinteractors
 
+import com.thefuntasty.mvvm.crinteractors.testinteractors.base.BaseCoroutineScopeOwnerTest
 import com.thefuntasty.mvvm.crinteractors.testinteractors.testinteractors.TestFailureInteractor
 import com.thefuntasty.mvvm.crinteractors.testinteractors.testinteractors.TestFlowFailureInteractor
 import com.thefuntasty.mvvm.crinteractors.testinteractors.testinteractors.TestFlowInteractor
 import com.thefuntasty.mvvm.crinteractors.testinteractors.testinteractors.TestInteractor
-import com.thefuntasty.mvvm.crinteractors.testinteractors.base.BaseCoroutineScopeOwnerTest
 import org.junit.Assert
 import org.junit.Test
 
@@ -14,13 +14,13 @@ class CoroutineScopeOwnerTest : BaseCoroutineScopeOwnerTest() {
     fun previousExecutionCanceled() {
         val testInteractor = TestInteractor().apply { init(1) }
         var count = 0
-        testInteractor.execute( {
+        testInteractor.execute({
             count++
         }, {
             Assert.fail("Exception thrown where shouldn't")
         })
         coroutineScope.advanceTimeBy(500)
-        testInteractor.execute( {
+        testInteractor.execute({
             count++
         }, {
             Assert.fail("Exception thrown where shouldn't")

diff --git a/...efuntasty/mvvm/crinteractors/testinteractors/testinteractors/TestFlowFailureInteractor.kt b/...efuntasty/mvvm/crinteractors/testinteractors/testinteractors/TestFlowFailureInteractor.kt
@@ -12,7 +12,7 @@ class TestFlowFailureInteractor : BaseFlowInteractor<Unit>() {
         this.error = errorToThrow
     }
 
-    override suspend fun build(): Flow<Unit> = flow {
+    override fun build(): Flow<Unit> = flow {
         throw error
     }
 }
diff --git a/.../com/thefuntasty/mvvm/crinteractors/testinteractors/testinteractors/TestFlowInteractor.kt b/.../com/thefuntasty/mvvm/crinteractors/testinteractors/testinteractors/TestFlowInteractor.kt
@@ -17,5 +17,5 @@ class TestFlowInteractor : BaseFlowInteractor<Int>() {
         this.delayBetweenEmits = delayBetweenEmits
     }
 
-    override suspend fun build(): Flow<Int> = listToEmit.asFlow().onEach { delay(delayBetweenEmits) }
+    override fun build(): Flow<Int> = listToEmit.asFlow().onEach { delay(delayBetweenEmits) }
 }
diff --git a/example/src/main/java/com/thefuntasty/mvvmsample/domain/GetFormFlowInteractor.kt b/example/src/main/java/com/thefuntasty/mvvmsample/domain/GetFormFlowInteractor.kt
@@ -8,5 +8,5 @@ import javax.inject.Inject
 class GetFormFlowInteractor @Inject constructor(
     private val formStore: FormStore
 ) : BaseFlowInteractor<Pair<String, String>>() {
-    override suspend fun build(): Flow<Pair<String, String>> = formStore.getFormFlow()
+    override fun build(): Flow<Pair<String, String>> = formStore.getFormFlow()
 }
diff --git a/mvvm-lint/.gitignore b/mvvm-lint/.gitignore
@@ -0,0 +1 @@
+/build