From 52f009a59d32623f428280d9d7c2bb4555fa1568 Mon Sep 17 00:00:00 2001
From: Lachlan McKee <lachlan.mckee@team.bumble.com>
Date: Fri, 11 Mar 2022 09:52:33 +0000
Subject: [PATCH 1/2] Renamed BaseFeature#Schedulers to avoid namespace
 collisions

---
 .../java/com/badoo/mvicore/feature/BaseFeature.kt    |  8 +-------
 .../com/badoo/mvicore/feature/FeatureSchedulers.kt   | 12 ++++++++++++
 .../badoo/mvicore/feature/AsyncBaseFeatureTest.kt    |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 mvicore/src/main/java/com/badoo/mvicore/feature/FeatureSchedulers.kt

diff --git a/mvicore/src/main/java/com/badoo/mvicore/feature/BaseFeature.kt b/mvicore/src/main/java/com/badoo/mvicore/feature/BaseFeature.kt
index 6676f2e4..e4ec3be4 100644
--- a/mvicore/src/main/java/com/badoo/mvicore/feature/BaseFeature.kt
+++ b/mvicore/src/main/java/com/badoo/mvicore/feature/BaseFeature.kt
@@ -33,7 +33,7 @@ open class BaseFeature<Wish : Any, in Action : Any, in Effect : Any, State : Any
     reducer: Reducer<State, Effect>,
     postProcessor: PostProcessor<Action, Effect, State>? = null,
     newsPublisher: NewsPublisher<Action, Effect, State, News>? = null,
-    private val schedulers: Schedulers? = null
+    private val schedulers: FeatureSchedulers? = null
 ) : AsyncFeature<Wish, State, News> {
 
     private val threadVerifier by lazy { SameThreadVerifier() }
@@ -289,10 +289,4 @@ open class BaseFeature<Wish : Any, in Action : Any, in Effect : Any, State : Any
             }
         }
     }
-
-    class Schedulers(
-        /** Should be single-threaded. */
-        val featureScheduler: Scheduler,
-        val observationScheduler: Scheduler
-    )
 }
diff --git a/mvicore/src/main/java/com/badoo/mvicore/feature/FeatureSchedulers.kt b/mvicore/src/main/java/com/badoo/mvicore/feature/FeatureSchedulers.kt
new file mode 100644
index 00000000..95235c08
--- /dev/null
+++ b/mvicore/src/main/java/com/badoo/mvicore/feature/FeatureSchedulers.kt
@@ -0,0 +1,12 @@
+package com.badoo.mvicore.feature
+
+import io.reactivex.Scheduler
+
+/**
+ * A set of [Scheduler]s that change the threading behaviour of a [Feature]
+ */
+class FeatureSchedulers(
+    /** Should be single-threaded. */
+    val featureScheduler: Scheduler,
+    val observationScheduler: Scheduler
+)
diff --git a/mvicore/src/test/java/com/badoo/mvicore/feature/AsyncBaseFeatureTest.kt b/mvicore/src/test/java/com/badoo/mvicore/feature/AsyncBaseFeatureTest.kt
index 0e81a713..cb685e83 100644
--- a/mvicore/src/test/java/com/badoo/mvicore/feature/AsyncBaseFeatureTest.kt
+++ b/mvicore/src/test/java/com/badoo/mvicore/feature/AsyncBaseFeatureTest.kt
@@ -193,7 +193,7 @@ class AsyncBaseFeatureTest {
         newsPublisher = newsPublisher,
         postProcessor = postProcessor,
         schedulers = if (featureScheduler != null && observationScheduler != null) {
-            BaseFeature.Schedulers(
+            FeatureSchedulers(
                 featureScheduler = featureScheduler,
                 observationScheduler = observationScheduler
             )

From eeadc13d8df5f9ad6d5e97457b63fcbfb48de965 Mon Sep 17 00:00:00 2001
From: Lachlan McKee <lachlan.mckee@team.bumble.com>
Date: Fri, 11 Mar 2022 14:02:07 +0000
Subject: [PATCH 2/2] Passed feature schedulers through feature subtypes

---
 .../java/com/badoo/mvicore/feature/ActorReducerFeature.kt   | 6 ++++--
 .../src/main/java/com/badoo/mvicore/feature/MemoFeature.kt  | 6 ++++--
 .../main/java/com/badoo/mvicore/feature/ReducerFeature.kt   | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/mvicore/src/main/java/com/badoo/mvicore/feature/ActorReducerFeature.kt b/mvicore/src/main/java/com/badoo/mvicore/feature/ActorReducerFeature.kt
index 9a798b0c..9193d3aa 100644
--- a/mvicore/src/main/java/com/badoo/mvicore/feature/ActorReducerFeature.kt
+++ b/mvicore/src/main/java/com/badoo/mvicore/feature/ActorReducerFeature.kt
@@ -10,12 +10,14 @@ open class ActorReducerFeature<Wish : Any, in Effect : Any, State : Any, News :
     bootstrapper: Bootstrapper<Wish>? = null,
     actor: Actor<State, Wish, Effect>,
     reducer: Reducer<State, Effect>,
-    newsPublisher: NewsPublisher<Wish, Effect, State, News>? = null
+    newsPublisher: NewsPublisher<Wish, Effect, State, News>? = null,
+    schedulers: FeatureSchedulers? = null
 ) : BaseFeature<Wish, Wish, Effect, State, News>(
     initialState = initialState,
     bootstrapper = bootstrapper,
     wishToAction = { wish -> wish },
     actor = actor,
     reducer = reducer,
-    newsPublisher = newsPublisher
+    newsPublisher = newsPublisher,
+    schedulers = schedulers
 )
diff --git a/mvicore/src/main/java/com/badoo/mvicore/feature/MemoFeature.kt b/mvicore/src/main/java/com/badoo/mvicore/feature/MemoFeature.kt
index 5edbbfbd..1516fff9 100644
--- a/mvicore/src/main/java/com/badoo/mvicore/feature/MemoFeature.kt
+++ b/mvicore/src/main/java/com/badoo/mvicore/feature/MemoFeature.kt
@@ -1,8 +1,10 @@
 package com.badoo.mvicore.feature
 
 open class MemoFeature<State : Any>(
-    initialState: State
+    initialState: State,
+    schedulers: FeatureSchedulers? = null
 ) : Feature<State, State, Nothing> by ReducerFeature<State, State, Nothing>(
     initialState = initialState,
-    reducer = { _, effect -> effect }
+    reducer = { _, effect -> effect },
+    schedulers = schedulers
 )
diff --git a/mvicore/src/main/java/com/badoo/mvicore/feature/ReducerFeature.kt b/mvicore/src/main/java/com/badoo/mvicore/feature/ReducerFeature.kt
index 2126d9aa..db2b5571 100644
--- a/mvicore/src/main/java/com/badoo/mvicore/feature/ReducerFeature.kt
+++ b/mvicore/src/main/java/com/badoo/mvicore/feature/ReducerFeature.kt
@@ -12,14 +12,16 @@ open class ReducerFeature<Wish : Any, State : Any, News : Any>(
     initialState: State,
     reducer: Reducer<State, Wish>,
     bootstrapper: Bootstrapper<Wish>? = null,
-    newsPublisher: SimpleNewsPublisher<Wish, State, News>? = null
+    newsPublisher: SimpleNewsPublisher<Wish, State, News>? = null,
+    schedulers: FeatureSchedulers? = null
 ) : BaseFeature<Wish, Wish, Wish, State, News>(
     initialState = initialState,
     bootstrapper = bootstrapper,
     wishToAction = { wish -> wish },
     actor = BypassActor(),
     reducer = reducer,
-    newsPublisher = newsPublisher
+    newsPublisher = newsPublisher,
+    schedulers = schedulers
 ) {
     class BypassActor<in State : Any, Wish : Any> : Actor<State, Wish, Wish>, NonWrappable {
         override fun invoke(state: State, wish: Wish): Observable<Wish> =