upgrade persistence dependencies

Author: fupelaqu

api/src/main/scala/app/softnetwork/resource/api/ResourceApi.scala

@@ -3,13 +3,14 @@ package app.softnetwork.resource.api
 import akka.actor.typed.ActorSystem
 import app.softnetwork.persistence.launch.PersistentEntity
 import app.softnetwork.persistence.launch.PersistenceGuardian._
+import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.resource.launch.GenericResourceApplication
 import app.softnetwork.resource.message.ResourceEvents.ResourceEvent
 import app.softnetwork.resource.message.ResourceMessages.{ResourceCommand, ResourceResult}
 import app.softnetwork.resource.model.Resource
 import app.softnetwork.resource.persistence.typed.ResourceBehavior
 
-trait ResourceApi extends GenericResourceApplication[Resource] {
+trait ResourceApi extends GenericResourceApplication[Resource] { _: SchemaProvider =>
 
   override def resourceEntity
     : ActorSystem[_] => PersistentEntity[ResourceCommand, Resource, ResourceEvent, ResourceResult] =

api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemApi.scala

@@ -2,6 +2,7 @@ package app.softnetwork.resource.api
 
 import akka.actor.typed.ActorSystem
 import app.softnetwork.persistence.jdbc.query.{JdbcJournalProvider, JdbcOffsetProvider}
+import app.softnetwork.persistence.jdbc.schema.JdbcSchemaProvider
 import app.softnetwork.resource.model.Resource
 import app.softnetwork.resource.persistence.query.{
   GenericResourceToExternalProcessorStream,
@@ -10,14 +11,14 @@ import app.softnetwork.resource.persistence.query.{
 import app.softnetwork.resource.service.{GenericResourceService, LocalFileSystemResourceService}
 import com.typesafe.config.Config
 
-trait ResourceToLocalFileSystemApi extends ResourceApi {
+trait ResourceToLocalFileSystemApi extends ResourceApi with JdbcSchemaProvider {
   override def resourceToExternalProcessorStream
     : ActorSystem[_] => GenericResourceToExternalProcessorStream[Resource] =
     sys =>
       new ResourceToLocalFileSystemProcessorStream()
         with JdbcJournalProvider
         with JdbcOffsetProvider {
-        override implicit val system: ActorSystem[_] = sys
+        override implicit def system: ActorSystem[_] = sys
         override def config: Config = ResourceToLocalFileSystemApi.this.config
       }
 

api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemPostgresLauncher.scala

@@ -1,17 +1,11 @@
 package app.softnetwork.resource.api
 
-import akka.actor.ActorSystem
-import app.softnetwork.persistence.jdbc.schema.PostgresSchemaProvider
-import app.softnetwork.persistence.typed._
-import com.typesafe.config.Config
+import app.softnetwork.persistence.jdbc.schema.JdbcSchemaTypes.Postgres
+import app.softnetwork.persistence.schema.SchemaType
 import org.slf4j.{Logger, LoggerFactory}
 
 object ResourceToLocalFileSystemPostgresLauncher extends ResourceToLocalFileSystemApi {
   lazy val log: Logger = LoggerFactory getLogger getClass.getName
 
-  override def schemaProvider = sys =>
-    new PostgresSchemaProvider {
-      override implicit def classicSystem: ActorSystem = sys
-      override def config: Config = ResourceToLocalFileSystemPostgresLauncher.this.config
-    }
+  override val schemaType: SchemaType = Postgres
 }

build.sbt

@@ -31,7 +31,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "resource"
 
-ThisBuild / version := "0.2.0"
+ThisBuild / version := "0.2.0.1"
 
 ThisBuild / scalaVersion := "2.12.15"
 

core/src/main/scala/app/softnetwork/resource/launch/GenericResourceApplication.scala

@@ -1,8 +1,9 @@
 package app.softnetwork.resource.launch
 
 import app.softnetwork.api.server.launch.Application
+import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.resource.model.GenericResource
 
 trait GenericResourceApplication[Resource <: GenericResource]
     extends Application
-    with GenericResourceRoutes[Resource]
+    with GenericResourceRoutes[Resource] { _: SchemaProvider => }

core/src/main/scala/app/softnetwork/resource/launch/GenericResourceGuardian.scala

@@ -3,6 +3,7 @@ package app.softnetwork.resource.launch
 import akka.actor.typed.ActorSystem
 import app.softnetwork.persistence.launch.{PersistenceGuardian, PersistentEntity}
 import app.softnetwork.persistence.query.EventProcessorStream
+import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.persistence.typed.Singleton
 import app.softnetwork.resource.message.ResourceEvents.ResourceEvent
 import app.softnetwork.resource.message.ResourceMessages.{ResourceCommand, ResourceResult}
@@ -12,7 +13,7 @@ import com.typesafe.scalalogging.StrictLogging
 
 trait GenericResourceGuardian[Resource <: GenericResource]
     extends PersistenceGuardian
-    with StrictLogging {
+    with StrictLogging { _: SchemaProvider =>
 
   def resourceEntity
     : ActorSystem[_] => PersistentEntity[ResourceCommand, Resource, ResourceEvent, ResourceResult]

core/src/main/scala/app/softnetwork/resource/launch/GenericResourceRoutes.scala

@@ -3,12 +3,13 @@ package app.softnetwork.resource.launch
 import akka.actor.typed.ActorSystem
 import akka.http.scaladsl.server.Route
 import app.softnetwork.api.server.ApiRoutes
+import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.resource.model.GenericResource
 import app.softnetwork.resource.service.GenericResourceService
 
 trait GenericResourceRoutes[Resource <: GenericResource]
     extends ApiRoutes
-    with GenericResourceGuardian[Resource] {
+    with GenericResourceGuardian[Resource] { _: SchemaProvider =>
 
   def resourceService: ActorSystem[_] => GenericResourceService
 

project/src/main/scala/app/softnetwork/sbt/build/Versions.scala

@@ -2,13 +2,13 @@ package app.softnetwork.sbt.build
 
 object Versions {
 
-  val genericPersistence = "0.3.0.2"
+  val genericPersistence = "0.3.0.3"
 
   val akkaPersistenceJdbc = "5.0.4"
 
-  val server = "0.3.0.2"
+  val server = "0.3.0.3"
 
-  val session = "0.3.0.2"
+  val session = "0.3.0.3"
 
   val scalatest = "3.1.1"
 }