add trait Schema and update SchemaProvider

Author: fupelaqu

build.sbt

@@ -30,7 +30,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "generic-persistence-api"
 
-ThisBuild / version := "0.3.0.2"
+ThisBuild / version := "0.3.0.3"
 
 ThisBuild / scalaVersion := "2.12.11"
 

core/src/main/scala/app/softnetwork/persistence/launch/InMemoryPersistenceGuardian.scala

@@ -0,0 +1,5 @@
+package app.softnetwork.persistence.launch
+
+import app.softnetwork.persistence.schema.InMemorySchemaProvider
+
+trait InMemoryPersistenceGuardian extends PersistenceGuardian with InMemorySchemaProvider

core/src/main/scala/app/softnetwork/persistence/launch/PersistenceGuardian.scala

@@ -23,7 +23,7 @@ import scala.language.implicitConversions
 
 /** Created by smanciot on 15/05/2020.
   */
-trait PersistenceGuardian extends ClusterDomainEventHandler {
+trait PersistenceGuardian extends ClusterDomainEventHandler { _: SchemaProvider =>
 
   def config: Config
 
@@ -50,8 +50,6 @@ trait PersistenceGuardian extends ClusterDomainEventHandler {
 
   def startSystem: ActorSystem[_] => Unit = _ => ()
 
-  def schemaProvider: ActorSystem[_] => SchemaProvider
-
   def banner: String =
     """
       | ____         __ _              _                      _
@@ -64,11 +62,10 @@ trait PersistenceGuardian extends ClusterDomainEventHandler {
 
   def setup(): Behavior[ClusterDomainEvent] = {
     Behaviors.setup[ClusterDomainEvent] { context =>
-
       val system = context.system
 
       // initialize schema
-      schemaProvider(system).initSchema()
+      schema(system).initSchema()
 
       val cluster: Cluster = Cluster(system)
 

core/src/main/scala/app/softnetwork/persistence/launch/package.scala

@@ -4,7 +4,6 @@ import akka.actor.typed.ActorSystem
 import akka.cluster.ClusterEvent.ClusterDomainEvent
 import app.softnetwork.persistence.message.{Command, CommandResult, Event}
 import app.softnetwork.persistence.model.State
-import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.persistence.typed.EntityBehavior
 
 package object launch {

core/src/main/scala/app/softnetwork/persistence/query/InMemoryOffsetProvider.scala

@@ -5,7 +5,7 @@ import akka.persistence.query.{Offset, Sequence}
 
 import scala.concurrent.Future
 
-trait InMemoryOffsetProvider extends OffsetProvider {
+trait InMemoryOffsetProvider extends OffsetProvider { _: EventStream =>
 
   private[this] var _offset: Long = 0L
 

core/src/main/scala/app/softnetwork/persistence/query/OffsetProvider.scala

@@ -7,17 +7,15 @@ import app.softnetwork.persistence.environment
 
 import scala.concurrent.Future
 
-trait OffsetProvider extends EventStream {
+trait OffsetProvider { _: EventStream =>
 
   implicit def classicSystem: classic.ActorSystem
 
   protected final lazy val platformEventProcessorId: String = s"$eventProcessorId-$environment"
 
   protected final lazy val platformTag: String = s"$tag-$environment"
 
-  protected def initOffset(): Unit = {}
-
-  protected def startOffset(): Offset = Offset.sequence(0L)
+  protected def initOffset(): Unit = ()
 
   /** Read current offset
     *
@@ -33,4 +31,8 @@ trait OffsetProvider extends EventStream {
     */
   protected def writeOffset(offset: Offset): Future[Done]
 
+  protected def stopOffset(): Unit = ()
+
+  sys.addShutdownHook(stopOffset())
+
 }

core/src/main/scala/app/softnetwork/persistence/schema/InMemorySchema.scala

@@ -0,0 +1,9 @@
+package app.softnetwork.persistence.schema
+
+/** Created by smanciot on 12/05/2021.
+  */
+trait InMemorySchema extends Schema {
+  override def schemaType: SchemaType = EmptySchema
+
+  override def create(schema: String, separator: String): Unit = ()
+}

core/src/main/scala/app/softnetwork/persistence/schema/InMemorySchemaProvider.scala

@@ -1,9 +1,6 @@
 package app.softnetwork.persistence.schema
+import akka.actor.typed.ActorSystem
 
-/** Created by smanciot on 12/05/2021.
-  */
 trait InMemorySchemaProvider extends SchemaProvider {
-  override def schemaType: SchemaType = EmptySchema
-
-  override def create(schema: String, separator: String): Unit = ()
+  override def schema: ActorSystem[_] => Schema = _ => new InMemorySchema {}
 }

core/src/main/scala/app/softnetwork/persistence/schema/Schema.scala

@@ -0,0 +1,14 @@
+package app.softnetwork.persistence.schema
+
+/** Created by smanciot on 07/05/2021.
+  */
+trait Schema {
+  def schemaType: SchemaType
+
+  def initSchema(): Unit = {
+    create(schemaType.schema)
+  }
+
+  def create(schema: String, separator: String = ";"): Unit
+
+}

core/src/main/scala/app/softnetwork/persistence/schema/SchemaProvider.scala

@@ -1,14 +1,9 @@
 package app.softnetwork.persistence.schema
 
-/** Created by smanciot on 07/05/2021.
-  */
-trait SchemaProvider {
-  def schemaType: SchemaType
+import akka.actor.typed.ActorSystem
 
-  def initSchema(): Unit = {
-    create(schemaType.schema)
-  }
+trait SchemaProvider {
 
-  def create(schema: String, separator: String = ";"): Unit
+  def schema: ActorSystem[_] => Schema
 
 }