From 9155fdac965e93de4ab5b6e43628bf20d15ce57d Mon Sep 17 00:00:00 2001 From: Rohan Sircar Date: Sun, 20 Dec 2020 16:30:06 +0530 Subject: [PATCH] Refactored reactive store --- src/main/scala/nova/monadic_sfx/MainModule.scala | 6 +++--- .../nova/monadic_sfx/ui/components/router/FXRouter.scala | 6 +++--- .../ui/components/todo/TodoListComponentOld.scala | 2 +- .../nova/monadic_sfx/ui/components/todo/TodoListStore.scala | 6 +++--- .../nova/monadic_sfx/ui/components/todo/TodoListView.scala | 2 +- .../monadic_sfx/util/reactive/{ => store}/Middlewares.scala | 2 +- .../util/reactive/{ => store}/MonixProSubject.scala | 2 +- .../monadic_sfx/util/reactive/{ => store}/Reducer.scala | 2 +- .../nova/monadic_sfx/util/reactive/{ => store}/Store.scala | 2 +- .../monadic_sfx/util/reactive/{ => store}/package.scala | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) rename src/main/scala/nova/monadic_sfx/util/reactive/{ => store}/Middlewares.scala (97%) rename src/main/scala/nova/monadic_sfx/util/reactive/{ => store}/MonixProSubject.scala (94%) rename src/main/scala/nova/monadic_sfx/util/reactive/{ => store}/Reducer.scala (96%) rename src/main/scala/nova/monadic_sfx/util/reactive/{ => store}/Store.scala (98%) rename src/main/scala/nova/monadic_sfx/util/reactive/{ => store}/package.scala (88%) diff --git a/src/main/scala/nova/monadic_sfx/MainModule.scala b/src/main/scala/nova/monadic_sfx/MainModule.scala index 0882d5a..7e5deb6 100644 --- a/src/main/scala/nova/monadic_sfx/MainModule.scala +++ b/src/main/scala/nova/monadic_sfx/MainModule.scala @@ -10,13 +10,13 @@ import io.odin.syntax._ import nova.monadic_sfx.actors.ActorModule import nova.monadic_sfx.http.HttpModule import nova.monadic_sfx.ui.UiModule -import nova.monadic_sfx.util.reactive.Middlewares +import nova.monadic_sfx.util.reactive.store.Middlewares trait MainModule extends ActorModule with UiModule with HttpModule { def routerLogger(defaultLogger: Logger[Task], storeLogger: Logger[Task]) = enclosureRouting[Task]( - "nova.monadic_sfx.util.reactive.Middlewares" -> storeLogger, - "nova.monadic_sfx.util.reactive.Store" -> storeLogger + "nova.monadic_sfx.util.reactive.store.Middlewares" -> storeLogger, + "nova.monadic_sfx.util.reactive.store.Store" -> storeLogger ) .withFallback(defaultLogger) .withAsync(timeWindow = 1.millis) diff --git a/src/main/scala/nova/monadic_sfx/ui/components/router/FXRouter.scala b/src/main/scala/nova/monadic_sfx/ui/components/router/FXRouter.scala index 9738d67..247a253 100644 --- a/src/main/scala/nova/monadic_sfx/ui/components/router/FXRouter.scala +++ b/src/main/scala/nova/monadic_sfx/ui/components/router/FXRouter.scala @@ -8,9 +8,9 @@ import io.circe.generic.semiauto._ import io.odin.Logger import monix.bio.Task import nova.monadic_sfx.util.IOUtils -import nova.monadic_sfx.util.reactive.Middlewares -import nova.monadic_sfx.util.reactive.Reducer -import nova.monadic_sfx.util.reactive.Store +import nova.monadic_sfx.util.reactive.store.Middlewares +import nova.monadic_sfx.util.reactive.store.Reducer +import nova.monadic_sfx.util.reactive.store.Store import scalafx.scene.Parent object FXRouter { diff --git a/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListComponentOld.scala b/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListComponentOld.scala index 539a4ae..daafe84 100644 --- a/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListComponentOld.scala +++ b/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListComponentOld.scala @@ -14,7 +14,7 @@ import nova.monadic_sfx.implicits.FontIcon import nova.monadic_sfx.implicits.IconLiteral import nova.monadic_sfx.implicits.JFXListView import nova.monadic_sfx.implicits._ -import nova.monadic_sfx.util.reactive._ +import nova.monadic_sfx.util.reactive.store._ import scalafx.Includes._ import scalafx.beans.property.StringProperty import scalafx.collections.ObservableBuffer diff --git a/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListStore.scala b/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListStore.scala index 891a9cc..5e7425f 100644 --- a/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListStore.scala +++ b/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListStore.scala @@ -4,9 +4,9 @@ import com.softwaremill.quicklens._ import io.circe.generic.JsonCodec import io.odin.Logger import monix.bio.Task -import nova.monadic_sfx.util.reactive.Middlewares.actionLoggerMiddleware -import nova.monadic_sfx.util.reactive.Reducer -import nova.monadic_sfx.util.reactive.Store +import nova.monadic_sfx.util.reactive.store.Middlewares.actionLoggerMiddleware +import nova.monadic_sfx.util.reactive.store.Reducer +import nova.monadic_sfx.util.reactive.store.Store case class Todo(id: Int, content: String) diff --git a/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListView.scala b/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListView.scala index d80a7e4..79c9609 100644 --- a/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListView.scala +++ b/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListView.scala @@ -10,7 +10,7 @@ import nova.monadic_sfx.implicits.JFXListView import nova.monadic_sfx.implicits.JFXTextField import nova.monadic_sfx.implicits.MenuItem import nova.monadic_sfx.implicits._ -import nova.monadic_sfx.util.reactive._ +import nova.monadic_sfx.util.reactive.store._ import org.gerweck.scalafx.util._ import scalafx.Includes._ import scalafx.beans.property.ObjectProperty diff --git a/src/main/scala/nova/monadic_sfx/util/reactive/Middlewares.scala b/src/main/scala/nova/monadic_sfx/util/reactive/store/Middlewares.scala similarity index 97% rename from src/main/scala/nova/monadic_sfx/util/reactive/Middlewares.scala rename to src/main/scala/nova/monadic_sfx/util/reactive/store/Middlewares.scala index 66c882a..7c1939e 100644 --- a/src/main/scala/nova/monadic_sfx/util/reactive/Middlewares.scala +++ b/src/main/scala/nova/monadic_sfx/util/reactive/store/Middlewares.scala @@ -1,4 +1,4 @@ -package nova.monadic_sfx.util.reactive +package nova.monadic_sfx.util.reactive.store import java.time.LocalDateTime diff --git a/src/main/scala/nova/monadic_sfx/util/reactive/MonixProSubject.scala b/src/main/scala/nova/monadic_sfx/util/reactive/store/MonixProSubject.scala similarity index 94% rename from src/main/scala/nova/monadic_sfx/util/reactive/MonixProSubject.scala rename to src/main/scala/nova/monadic_sfx/util/reactive/store/MonixProSubject.scala index 4f47370..139bf05 100644 --- a/src/main/scala/nova/monadic_sfx/util/reactive/MonixProSubject.scala +++ b/src/main/scala/nova/monadic_sfx/util/reactive/store/MonixProSubject.scala @@ -1,4 +1,4 @@ -package nova.monadic_sfx.util.reactive +package nova.monadic_sfx.util.reactive.store import scala.concurrent.Future diff --git a/src/main/scala/nova/monadic_sfx/util/reactive/Reducer.scala b/src/main/scala/nova/monadic_sfx/util/reactive/store/Reducer.scala similarity index 96% rename from src/main/scala/nova/monadic_sfx/util/reactive/Reducer.scala rename to src/main/scala/nova/monadic_sfx/util/reactive/store/Reducer.scala index 8a78a73..f81743e 100644 --- a/src/main/scala/nova/monadic_sfx/util/reactive/Reducer.scala +++ b/src/main/scala/nova/monadic_sfx/util/reactive/store/Reducer.scala @@ -1,4 +1,4 @@ -package nova.monadic_sfx.util.reactive +package nova.monadic_sfx.util.reactive.store import cats.implicits._ import monix.reactive.Observable diff --git a/src/main/scala/nova/monadic_sfx/util/reactive/Store.scala b/src/main/scala/nova/monadic_sfx/util/reactive/store/Store.scala similarity index 98% rename from src/main/scala/nova/monadic_sfx/util/reactive/Store.scala rename to src/main/scala/nova/monadic_sfx/util/reactive/store/Store.scala index e6b7915..2beeed7 100644 --- a/src/main/scala/nova/monadic_sfx/util/reactive/Store.scala +++ b/src/main/scala/nova/monadic_sfx/util/reactive/store/Store.scala @@ -1,4 +1,4 @@ -package nova.monadic_sfx.util.reactive +package nova.monadic_sfx.util.reactive.store import java.time.LocalDateTime diff --git a/src/main/scala/nova/monadic_sfx/util/reactive/package.scala b/src/main/scala/nova/monadic_sfx/util/reactive/store/package.scala similarity index 88% rename from src/main/scala/nova/monadic_sfx/util/reactive/package.scala rename to src/main/scala/nova/monadic_sfx/util/reactive/store/package.scala index 09315db..d0fe3f0 100644 --- a/src/main/scala/nova/monadic_sfx/util/reactive/package.scala +++ b/src/main/scala/nova/monadic_sfx/util/reactive/store/package.scala @@ -1,9 +1,9 @@ -package nova.monadic_sfx.util +package nova.monadic_sfx.util.reactive import monix.reactive.Observable import monix.reactive.Observer -package object reactive { +package object store { type MonixProSubject[-I, +O] = Observable[O] with Observer[I] type Middleware[A, M] = Observable[(A, M)] => Observable[(A, M)] type Store[A, M] = MonixProSubject[A, (A, M)]