refactoring after upgrading server dependencies

Author: fupelaqu

api/src/main/resources/reference.conf

@@ -2,7 +2,7 @@ include "softnetwork-jdbc-persistence.conf"
 include "softnetwork-scheduler.conf"
 
 softnetwork.api.name = "softnetwork-scheduler"
-softnetwork.api.version = "0.3.2.3"
+softnetwork.api.version = "0.3.5"
 softnetwork.api.server.port = 9000
 softnetwork.api.server.request-timeout = 120 s
 softnetwork.api.server.swagger-path-prefix = ["swagger", "scheduler"]

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

@@ -13,5 +13,6 @@ trait SchedulerEndpoints extends ApiEndpoints with SchedulerGuardian { _: Schema
   def schedulerEndpoints: ActorSystem[_] => SchedulerServiceEndpoints = system =>
     SchedulerServiceEndpoints.apply(system, sessionEndpoints(system))
 
-  override def endpoints: ActorSystem[_] => List[ApiEndpoint] = system => List(schedulerEndpoints(system))
+  override def endpoints: ActorSystem[_] => List[ApiEndpoint] = system =>
+    List(schedulerEndpoints(system))
 }

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

@@ -2,7 +2,7 @@ package app.softnetwork.scheduler.launch
 
 import akka.actor.typed.ActorSystem
 import akka.http.scaladsl.server.Route
-import app.softnetwork.api.server.ApiRoutes
+import app.softnetwork.api.server.{ApiRoute, ApiRoutes}
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.scheduler.service.SchedulerService
 import app.softnetwork.session.service.SessionService
@@ -14,6 +14,10 @@ trait SchedulerRoutes extends ApiRoutes with SchedulerGuardian { _: SchemaProvid
   def schedulerService: ActorSystem[_] => SchedulerService = system =>
     SchedulerService(system, sessionService(system))
 
-  override def apiRoutes(system: ActorSystem[_]): Route = schedulerService(system).route
+  override def apiRoutes: ActorSystem[_] => List[ApiRoute] =
+    system =>
+      List(
+        schedulerService(system)
+      )
 
 }

core/src/main/scala/app/softnetwork/scheduler/service/SchedulerService.scala

@@ -27,7 +27,8 @@ trait SchedulerService
     with StrictLogging
     with Service[SchedulerCommand, SchedulerCommandResult]
     with SchedulerDao
-    with SchedulerHandler {
+    with SchedulerHandler
+    with ApiRoute {
 
   implicit def serialization: Serialization.type = jackson.Serialization
 

core/src/main/scala/app/softnetwork/scheduler/service/SchedulerServiceEndpoints.scala

@@ -170,7 +170,6 @@ trait SchedulerServiceEndpoints
       loadSchedulerEndpoint
     )
 
-  lazy val route: Route = apiRoute
 }
 
 object SchedulerServiceEndpoints {

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

@@ -2,7 +2,7 @@ package app.softnetwork.sbt.build
 
 object Versions {
 
-  val genericPersistence = "0.3.4"
+  val genericPersistence = "0.3.5"
 
   val scalatest = "3.1.1"
 }

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

@@ -2,14 +2,13 @@ package app.softnetwork.scheduler.scalatest
 
 import akka.actor.typed.ActorSystem
 import app.softnetwork.api.server.ApiEndpoint
-import app.softnetwork.scheduler.service.SchedulerServiceEndpoints
+import app.softnetwork.persistence.schema.SchemaProvider
+import app.softnetwork.scheduler.launch.SchedulerEndpoints
 import app.softnetwork.session.scalatest.SessionEndpointsRoutes
 import com.softwaremill.session.CsrfCheck
 
-trait SchedulerEndpointsTestKit extends SessionEndpointsRoutes { _: CsrfCheck =>
-
-  def schedulerEndpoints: ActorSystem[_] => SchedulerServiceEndpoints = system =>
-    SchedulerServiceEndpoints.apply(system, sessionEndpoints(system))
+trait SchedulerEndpointsTestKit extends SchedulerEndpoints with SessionEndpointsRoutes {
+  _: SchemaProvider with CsrfCheck =>
 
   override def endpoints: ActorSystem[_] => List[ApiEndpoint] =
     system =>

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

@@ -1,16 +1,19 @@
 package app.softnetwork.scheduler.scalatest
 
 import akka.actor.typed.ActorSystem
-import akka.http.scaladsl.server.Route
-import app.softnetwork.scheduler.service.SchedulerService
+import app.softnetwork.api.server.ApiRoute
+import app.softnetwork.persistence.schema.SchemaProvider
+import app.softnetwork.scheduler.launch.SchedulerRoutes
 import app.softnetwork.session.scalatest.SessionServiceRoutes
 
-trait SchedulerRoutesTestKit extends SessionServiceRoutes {
+trait SchedulerRoutesTestKit extends SchedulerRoutes with SessionServiceRoutes {
+  _: SchemaProvider =>
 
-  def schedulerService: ActorSystem[_] => SchedulerService = system =>
-    SchedulerService(system, sessionService(system))
-
-  override def apiRoutes(system: ActorSystem[_]): Route =
-    sessionServiceRoute(system).route ~ schedulerService(system).route
+  override def apiRoutes: ActorSystem[_] => List[ApiRoute] =
+    system =>
+      List(
+        sessionServiceRoute(system),
+        schedulerService(system)
+      )
 
 }