upgrade server dependencies, add scheduler grpc services

Author: fupelaqu

api/src/main/scala/app/softnetwork/scheduler/api/SchedulerApi.scala

@@ -1,7 +1,6 @@
 package app.softnetwork.scheduler.api
 
 import akka.actor.typed.ActorSystem
-import akka.http.scaladsl.model.{HttpRequest, HttpResponse}
 import app.softnetwork.persistence.jdbc.query.{JdbcJournalProvider, JdbcOffsetProvider}
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.scheduler.handlers.SchedulerHandler
@@ -11,8 +10,6 @@ import app.softnetwork.session.config.Settings
 import com.typesafe.config.Config
 import org.softnetwork.session.model.Session
 
-import scala.concurrent.Future
-
 trait SchedulerApi extends SchedulerApplication { _: SchemaProvider =>
 
   override def entity2SchedulerProcessorStream: ActorSystem[_] => Entity2SchedulerProcessorStream =
@@ -27,10 +24,6 @@ trait SchedulerApi extends SchedulerApplication { _: SchemaProvider =>
         override implicit def system: ActorSystem[_] = sys
       }
 
-  override def grpcServices
-    : ActorSystem[_] => Seq[PartialFunction[HttpRequest, Future[HttpResponse]]] = system =>
-    Seq(SchedulerServiceApiHandler.partial(schedulerServer(system))(system))
-
   override protected def sessionType: Session.SessionType =
     Settings.Session.SessionContinuityAndTransport
 

build.sbt

@@ -2,7 +2,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "scheduler"
 
-ThisBuild / version := "0.6.2"
+ThisBuild / version := "0.6.3"
 
 ThisBuild / scalaVersion := "2.12.15"
 

core/src/main/scala/app/softnetwork/scheduler/api/SchedulerGrpcService.scala

@@ -0,0 +1,12 @@
+package app.softnetwork.scheduler.api
+
+import akka.actor.typed.ActorSystem
+import akka.http.scaladsl.model.{HttpRequest, HttpResponse}
+import app.softnetwork.api.server.GrpcService
+
+import scala.concurrent.Future
+
+class SchedulerGrpcService(server: SchedulerServer) extends GrpcService {
+  override def grpcService: ActorSystem[_] => PartialFunction[HttpRequest, Future[HttpResponse]] =
+    system => SchedulerServiceApiHandler.partial(server)(system)
+}

core/src/main/scala/app/softnetwork/scheduler/api/SchedulerGrpcServices.scala

@@ -0,0 +1,12 @@
+package app.softnetwork.scheduler.api
+
+import akka.actor.typed.ActorSystem
+import app.softnetwork.api.server.{GrpcService, GrpcServices}
+import app.softnetwork.scheduler.launch.SchedulerGuardian
+
+trait SchedulerGrpcServices extends GrpcServices { _: SchedulerGuardian =>
+
+  override def grpcServices: ActorSystem[_] => Seq[GrpcService] = system =>
+    schedulerGrpcServices(system)
+
+}

core/src/main/scala/app/softnetwork/scheduler/launch/SchedulerApplication.scala

@@ -3,7 +3,12 @@ package app.softnetwork.scheduler.launch
 import app.softnetwork.api.server.ApiRoutes
 import app.softnetwork.api.server.launch.Application
 import app.softnetwork.persistence.schema.SchemaProvider
+import app.softnetwork.scheduler.api.SchedulerGrpcServices
 
-trait SchedulerApplication extends Application with ApiRoutes with SchedulerGuardian {
+trait SchedulerApplication
+    extends Application
+    with ApiRoutes
+    with SchedulerGuardian
+    with SchedulerGrpcServices {
   _: SchemaProvider =>
 }

core/src/main/scala/app/softnetwork/scheduler/launch/SchedulerGuardian.scala

@@ -1,12 +1,13 @@
 package app.softnetwork.scheduler.launch
 
 import akka.actor.typed.ActorSystem
+import app.softnetwork.api.server.GrpcService
 import app.softnetwork.persistence.launch.PersistentEntity
 import app.softnetwork.persistence.launch.PersistenceGuardian._
 import app.softnetwork.persistence.query.EventProcessorStream
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.scheduler.SchedulerCoreBuildInfo
-import app.softnetwork.scheduler.api.SchedulerServer
+import app.softnetwork.scheduler.api.{SchedulerGrpcService, SchedulerServer}
 import app.softnetwork.scheduler.handlers.SchedulerDao
 import app.softnetwork.scheduler.persistence.query.{
   Entity2SchedulerProcessorStream,
@@ -59,6 +60,11 @@ trait SchedulerGuardian extends SessionGuardian with CsrfCheckHeader { self: Sch
     */
   def schedulerServer: ActorSystem[_] => SchedulerServer = sys => SchedulerServer(sys)
 
+  def schedulerGrpcServices: ActorSystem[_] => Seq[GrpcService] = system =>
+    Seq(
+      new SchedulerGrpcService(schedulerServer(system))
+    )
+
   override def initSystem: ActorSystem[_] => Unit = initSchedulerSystem
 
   override def systemVersion(): String =

project/Versions.scala

@@ -1,6 +1,6 @@
 object Versions {
 
-  val genericPersistence = "0.6.1"
+  val genericPersistence = "0.6.2"
 
   val scalatest = "3.2.16"
 }

testkit/src/main/scala/app/softnetwork/scheduler/api/SchedulerGrpcServer.scala renamed to testkit/src/main/scala/app/softnetwork/scheduler/api/SchedulerGrpcServerTestKit.scala

@@ -5,9 +5,9 @@ import app.softnetwork.persistence.scalatest.InMemoryPersistenceTestKit
 import app.softnetwork.scheduler.launch.SchedulerGuardian
 import org.scalatest.Suite
 
-trait SchedulerGrpcServer
+trait SchedulerGrpcServerTestKit
     extends PersistenceScalatestGrpcTest
-    with SchedulerGrpcServices
+    with SchedulerGrpcServicesTestKit
     with InMemoryPersistenceTestKit { _: Suite with SchedulerGuardian =>
   override lazy val additionalConfig: String = schedulerGrpcConfig
 }

testkit/src/main/scala/app/softnetwork/scheduler/api/SchedulerGrpcServices.scala renamed to testkit/src/main/scala/app/softnetwork/scheduler/api/SchedulerGrpcServicesTestKit.scala

@@ -1,24 +1,11 @@
 package app.softnetwork.scheduler.api
 
-import akka.actor.typed.ActorSystem
-import akka.http.scaladsl.model.{HttpRequest, HttpResponse}
-import app.softnetwork.api.server.GrpcServices
 import app.softnetwork.api.server.scalatest.ServerTestKit
 import app.softnetwork.scheduler.launch.SchedulerGuardian
 
-import scala.concurrent.Future
-
-trait SchedulerGrpcServices extends GrpcServices {
+trait SchedulerGrpcServicesTestKit extends SchedulerGrpcServices {
   _: SchedulerGuardian with ServerTestKit =>
 
-  override def grpcServices
-    : ActorSystem[_] => Seq[PartialFunction[HttpRequest, Future[HttpResponse]]] =
-    schedulerGrpcServices
-
-  def schedulerGrpcServices
-    : ActorSystem[_] => Seq[PartialFunction[HttpRequest, Future[HttpResponse]]] = system =>
-    Seq(SchedulerServiceApiHandler.partial(schedulerServer(system))(system))
-
   def schedulerGrpcConfig: String = s"""
                               |# Important: enable HTTP/2 in ActorSystem's config
                               |akka.http.server.preview.enable-http2 = on

testkit/src/main/scala/app/softnetwork/scheduler/scalatest/SchedulerRouteTestKit.scala

@@ -3,7 +3,7 @@ package app.softnetwork.scheduler.scalatest
 import akka.http.scaladsl.model.{StatusCode, StatusCodes}
 import app.softnetwork.api.server.ApiRoutes
 import app.softnetwork.api.server.config.ServerSettings.RootPath
-import app.softnetwork.scheduler.api.SchedulerGrpcServices
+import app.softnetwork.scheduler.api.SchedulerGrpcServicesTestKit
 import app.softnetwork.scheduler.config.SchedulerSettings.SchedulerPath
 import app.softnetwork.scheduler.message._
 import app.softnetwork.scheduler.model.{CronTab, Schedule, Scheduler}
@@ -16,7 +16,7 @@ import org.softnetwork.session.model.Session
 trait SchedulerRouteTestKit
     extends SessionTestKit[Session]
     with SchedulerTestKit
-    with SchedulerGrpcServices {
+    with SchedulerGrpcServicesTestKit {
   _: Suite with ApiRoutes with SessionMaterials[Session] =>
 
   override def beforeAll(): Unit = {