update notification api to get rid of jdbc schema provider

Author: fupelaqu

api/src/main/scala/app/softnetwork/notification/api/AllNotificationsApi.scala

@@ -13,11 +13,11 @@ import app.softnetwork.notification.persistence.typed.{
   NotificationBehavior
 }
 import app.softnetwork.persistence.jdbc.query.{JdbcJournalProvider, JdbcOffsetProvider}
-import app.softnetwork.persistence.jdbc.schema.JdbcSchemaProvider
+import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.scheduler.config.SchedulerSettings
 import com.typesafe.config.Config
 
-trait AllNotificationsApi extends NotificationApplication[Notification] with JdbcSchemaProvider {
+trait AllNotificationsApi extends NotificationApplication[Notification] { _: SchemaProvider =>
 
   override def notificationBehaviors: ActorSystem[_] => Seq[NotificationBehavior[Notification]] =
     _ => Seq(AllNotificationsBehavior)

api/src/main/scala/app/softnetwork/notification/api/AllNotificationsPostgresLauncher.scala

@@ -1,12 +1,21 @@
 package app.softnetwork.notification.api
 
-import app.softnetwork.persistence.jdbc.schema.JdbcSchemaTypes
-import app.softnetwork.persistence.schema.SchemaType
+import akka.actor
+import akka.actor.typed.ActorSystem
+import app.softnetwork.persistence.jdbc.schema.{JdbcSchema, JdbcSchemaTypes}
+import app.softnetwork.persistence.schema.{Schema, SchemaProvider, SchemaType}
+import app.softnetwork.persistence.typed._
+import com.typesafe.config.Config
 import org.slf4j.{Logger, LoggerFactory}
 
-object AllNotificationsPostgresLauncher extends AllNotificationsApi {
+object AllNotificationsPostgresLauncher extends AllNotificationsApi with SchemaProvider {
 
   lazy val log: Logger = LoggerFactory getLogger getClass.getName
 
-  override val schemaType: SchemaType = JdbcSchemaTypes.Postgres
+  override def schema: ActorSystem[_] => Schema = sys =>
+    new JdbcSchema {
+      override def schemaType: SchemaType = JdbcSchemaTypes.Postgres
+      override implicit def classicSystem: actor.ActorSystem = sys
+      override def config: Config = AllNotificationsPostgresLauncher.this.config
+    }
 }

api/src/main/scala/app/softnetwork/notification/api/AllNotificationsWithSchedulerApi.scala

@@ -4,11 +4,13 @@ import akka.actor.typed.ActorSystem
 import akka.http.scaladsl.model.{HttpRequest, HttpResponse}
 import app.softnetwork.persistence.launch.PersistentEntity
 import app.softnetwork.persistence.query.EventProcessorStream
+import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.scheduler.api.{SchedulerApi, SchedulerServiceApiHandler}
 
 import scala.concurrent.Future
 
 trait AllNotificationsWithSchedulerApi extends AllNotificationsApi with SchedulerApi {
+  _: SchemaProvider =>
 
   override def entities: ActorSystem[_] => Seq[PersistentEntity[_, _, _, _]] = sys =>
     schedulerEntities(sys) ++ notificationEntities(sys)

api/src/main/scala/app/softnetwork/notification/api/AllNotificationsWithSchedulerPostgresLauncher.scala

@@ -1,12 +1,23 @@
 package app.softnetwork.notification.api
 
-import app.softnetwork.persistence.jdbc.schema.JdbcSchemaTypes
-import app.softnetwork.persistence.schema.SchemaType
+import akka.actor
+import akka.actor.typed.ActorSystem
+import app.softnetwork.persistence.jdbc.schema.{JdbcSchema, JdbcSchemaTypes}
+import app.softnetwork.persistence.schema.{Schema, SchemaProvider, SchemaType}
+import app.softnetwork.persistence.typed._
+import com.typesafe.config.Config
 import org.slf4j.{Logger, LoggerFactory}
 
-object AllNotificationsWithSchedulerPostgresLauncher extends AllNotificationsWithSchedulerApi {
+object AllNotificationsWithSchedulerPostgresLauncher
+    extends AllNotificationsWithSchedulerApi
+    with SchemaProvider {
 
   lazy val log: Logger = LoggerFactory getLogger getClass.getName
 
-  override val schemaType: SchemaType = JdbcSchemaTypes.Postgres
+  override def schema: ActorSystem[_] => Schema = sys =>
+    new JdbcSchema {
+      override def schemaType: SchemaType = JdbcSchemaTypes.Postgres
+      override implicit def classicSystem: actor.ActorSystem = sys
+      override def config: Config = AllNotificationsWithSchedulerPostgresLauncher.this.config
+    }
 }