refactoring after upgrading server dependencies

Author: fupelaqu

build.sbt

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

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

@@ -1,8 +1,7 @@
 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.api.server.{ApiRoute, ApiRoutes}
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.resource.model.GenericResource
 import app.softnetwork.resource.service.ResourceService
@@ -16,6 +15,10 @@ trait ResourceRoutes[Resource <: GenericResource]
 
   def resourceService: ActorSystem[_] => ResourceService
 
-  override def apiRoutes(system: ActorSystem[_]): Route = resourceService(system).route
+  override def apiRoutes: ActorSystem[_] => List[ApiRoute] =
+    system =>
+      List(
+        resourceService(system)
+      )
 
 }

core/src/main/scala/app/softnetwork/resource/service/ResourceService.scala

@@ -28,7 +28,8 @@ trait ResourceService
     with DefaultComplete
     with Json4sSupport
     with StrictLogging
-    with LoadResourceService {
+    with LoadResourceService
+    with ApiRoute {
   _: GenericResourceHandler with ResourceProvider =>
 
   implicit def serialization: Serialization.type = jackson.Serialization

core/src/main/scala/app/softnetwork/resource/service/ResourceServiceEndpoints.scala

@@ -1,6 +1,5 @@
 package app.softnetwork.resource.service
 
-import akka.http.scaladsl.server.Route
 import akka.stream.scaladsl.{FileIO, Source}
 import akka.util.ByteString
 import app.softnetwork.api.server.ApiErrors
@@ -232,7 +231,6 @@ trait ResourceServiceEndpoints
     deleteResource
   )
 
-  lazy val route: Route = apiRoute
 }
 
 sealed trait Upload {

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/resource/scalatest/ResourceEndpointsTestKit.scala

@@ -2,18 +2,20 @@ package app.softnetwork.resource.scalatest
 
 import akka.actor.typed.ActorSystem
 import app.softnetwork.api.server.ApiEndpoint
-import app.softnetwork.resource.service.ResourceServiceEndpoints
+import app.softnetwork.persistence.schema.SchemaProvider
+import app.softnetwork.resource.launch.ResourceEndpoints
+import app.softnetwork.resource.model.GenericResource
 import app.softnetwork.session.scalatest.SessionEndpointsRoutes
 import com.softwaremill.session.CsrfCheck
 
-trait ResourceEndpointsTestKit extends SessionEndpointsRoutes { _: CsrfCheck =>
-
-  def resourceServiceEndpoints: ActorSystem[_] => ResourceServiceEndpoints
+trait ResourceEndpointsTestKit[Resource <: GenericResource]
+    extends ResourceEndpoints[Resource]
+    with SessionEndpointsRoutes { _: SchemaProvider with CsrfCheck =>
 
   override def endpoints: ActorSystem[_] => List[ApiEndpoint] =
     system =>
       List(
         sessionServiceEndpoints(system),
-        resourceServiceEndpoints(system)
+        resourceEndpoints(system)
       )
 }

testkit/src/main/scala/app/softnetwork/resource/scalatest/ResourceRoutesTestKit.scala

@@ -1,16 +1,22 @@
 package app.softnetwork.resource.scalatest
 
 import akka.actor.typed.ActorSystem
-import akka.http.scaladsl.server.Route
-import app.softnetwork.resource.service.ResourceService
+import app.softnetwork.api.server.ApiRoute
+import app.softnetwork.persistence.schema.SchemaProvider
+import app.softnetwork.resource.launch.ResourceRoutes
+import app.softnetwork.resource.model.GenericResource
 import app.softnetwork.session.scalatest.SessionServiceRoutes
 import org.scalatest.Suite
 
-trait ResourceRoutesTestKit extends SessionServiceRoutes { _: Suite =>
+trait ResourceRoutesTestKit[Resource <: GenericResource]
+    extends ResourceRoutes[Resource]
+    with SessionServiceRoutes { _: Suite with SchemaProvider =>
 
-  def resourceService: ActorSystem[_] => ResourceService
-
-  override def apiRoutes(system: ActorSystem[_]): Route =
-    sessionServiceRoute(system).route ~ resourceService(system).route
+  override def apiRoutes: ActorSystem[_] => List[ApiRoute] =
+    system =>
+      List(
+        sessionServiceRoute(system),
+        resourceService(system)
+      )
 
 }

testkit/src/main/scala/app/softnetwork/resource/scalatest/ResourceToLocalFileSystemEndpointsTestKit.scala

@@ -1,6 +1,7 @@
 package app.softnetwork.resource.scalatest
 
 import akka.actor.typed.ActorSystem
+import app.softnetwork.resource.model.Resource
 import app.softnetwork.resource.service.{
   LocalFileSystemResourceServiceEndpoints,
   ResourceServiceEndpoints
@@ -10,10 +11,10 @@ import org.scalatest.Suite
 
 trait ResourceToLocalFileSystemEndpointsTestKit
     extends ResourceToLocalFileSystemRouteTestKit
-    with ResourceEndpointsTestKit {
+    with ResourceEndpointsTestKit[Resource] {
   _: Suite with CsrfCheck =>
 
-  def resourceServiceEndpoints: ActorSystem[_] => ResourceServiceEndpoints = system =>
-    LocalFileSystemResourceServiceEndpoints(system, sessionEndpoints(system))
+  def resourceEndpoints: ActorSystem[_] => ResourceServiceEndpoints =
+    system => LocalFileSystemResourceServiceEndpoints(system, sessionEndpoints(system))
 
 }

testkit/src/main/scala/app/softnetwork/resource/scalatest/ResourceToLocalFileSystemRoutesTestKit.scala

@@ -1,12 +1,13 @@
 package app.softnetwork.resource.scalatest
 
 import akka.actor.typed.ActorSystem
+import app.softnetwork.resource.model.Resource
 import app.softnetwork.resource.service.{LocalFileSystemResourceService, ResourceService}
 import org.scalatest.Suite
 
 trait ResourceToLocalFileSystemRoutesTestKit
     extends ResourceToLocalFileSystemRouteTestKit
-    with ResourceRoutesTestKit {
+    with ResourceRoutesTestKit[Resource] {
   _: Suite =>
 
   override def resourceService: ActorSystem[_] => ResourceService = system =>