add api route

Author: fupelaqu

build.sbt

@@ -30,7 +30,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "generic-persistence-api"
 
-ThisBuild / version := "0.3.4.1"
+ThisBuild / version := "0.3.5"
 
 ThisBuild / scalaVersion := "2.12.11"
 
@@ -143,6 +143,13 @@ lazy val jdbcTestkit = project.in(file("jdbc/testkit"))
     coreTestkit % "compile->compile;test->test;it->it"
   )
 
+lazy val cassandra = project.in(file("cassandra"))
+  .configs(IntegrationTest)
+  .settings(Defaults.itSettings)
+  .dependsOn(
+    core % "compile->compile;test->test;it->it"
+  )
+
 lazy val counter = project.in(file("counter"))
   .configs(IntegrationTest)
   .settings(Defaults.itSettings/*, pbSettings*/)
@@ -198,6 +205,7 @@ lazy val root = project.in(file("."))
     coreTestkit,
     jdbc,
     jdbcTestkit,
+//    cassandra,
     counter,
     elastic,
     elasticTestkit,

server/src/main/scala/app/softnetwork/api/server/ApiEndpoint.scala

@@ -11,18 +11,22 @@ import sttp.tapir.server.akkahttp.AkkaHttpServerInterpreter
 import scala.concurrent.{ExecutionContext, Future}
 import scala.language.implicitConversions
 
-trait ApiEndpoint extends SwaggerApiEndpoint {
+trait ApiEndpoint extends ApiRoute with SwaggerApiEndpoint {
 
   import ApiEndpoint._
 
+  implicit def ec: ExecutionContext
+
   def endpoints: List[ServerEndpoint[AkkaStreams with WebSockets, Future]]
 
   def swaggerEndpoints: List[ServerEndpoint[AkkaStreams with WebSockets, Future]] =
     endpointsToSwaggerEndpoints(endpoints)
 
-  def swaggerRoute(implicit ec: ExecutionContext): Route = swaggerEndpoints
+  def swaggerRoute: Route = swaggerEndpoints
+
+  def apiRoute: Route = endpoints
 
-  def apiRoute(implicit ec: ExecutionContext): Route = endpoints
+  override def route: Route = apiRoute ~ swaggerRoute
 
   implicit def formats: Formats = commonFormats
 

server/src/main/scala/app/softnetwork/api/server/ApiEndpoints.scala

@@ -1,17 +1,10 @@
 package app.softnetwork.api.server
 
 import akka.actor.typed.ActorSystem
-import akka.http.scaladsl.server.Route
-
-import scala.concurrent.ExecutionContext
 
 trait ApiEndpoints extends ApiRoutes {
 
   def endpoints: ActorSystem[_] => List[ApiEndpoint]
 
-  override def apiRoutes(system: ActorSystem[_]): Route = {
-    implicit def ec: ExecutionContext = system.executionContext
-    concat(endpoints(system).map(api => api.apiRoute ~ api.swaggerRoute): _*)
-  }
-
+  final override def apiRoutes: ActorSystem[_] => List[ApiRoute] = endpoints
 }

server/src/main/scala/app/softnetwork/api/server/ApiRoute.scala

@@ -0,0 +1,9 @@
+package app.softnetwork.api.server
+
+import akka.http.scaladsl.server.{Route, RouteConcatenation}
+
+trait ApiRoute extends RouteConcatenation {
+
+  def route: Route
+
+}

server/src/main/scala/app/softnetwork/api/server/ApiRoutes.scala

@@ -39,7 +39,7 @@ trait ApiRoutes extends Directives with GrpcServices with DefaultComplete {
         pathPrefix(config.ServerSettings.RootPath) {
           Try(
             respondWithHeaders(RawHeader("Api-Version", applicationVersion)) {
-              HealthCheckService.route ~ apiRoutes(system)
+              concat((HealthCheckService :: apiRoutes(system)).map(_.route): _*)
             }
           ) match {
             case Success(s) => s
@@ -57,5 +57,6 @@ trait ApiRoutes extends Directives with GrpcServices with DefaultComplete {
     } ~ grpcRoutes(system)
   }
 
-  def apiRoutes(system: ActorSystem[_]): Route
+  def apiRoutes: ActorSystem[_] => List[ApiRoute]
+
 }

server/src/main/scala/app/softnetwork/api/server/HealthCheckService.scala

@@ -9,7 +9,7 @@ import org.json4s.Formats
   * actual checking of the service's internal state, verifying needed actors are still alive, and so
   * on.
   */
-object HealthCheckService extends Directives with DefaultComplete {
+object HealthCheckService extends Directives with DefaultComplete with ApiRoute {
 
   implicit def formats: Formats = commonFormats
 

server/src/main/scala/app/softnetwork/api/server/launch/HealthCheckApplication.scala

@@ -6,6 +6,4 @@ import akka.http.scaladsl.server.Route
 import app.softnetwork.api.server.ApiRoutes
 import app.softnetwork.persistence.schema.SchemaProvider
 
-trait HealthCheckApplication extends Application with ApiRoutes { _: SchemaProvider =>
-  override def apiRoutes(system: ActorSystem[_]): Route = complete(StatusCodes.NotFound)
-}
+trait HealthCheckApplication extends Application with ApiRoutes { _: SchemaProvider => }

server/testkit/src/main/scala/app/softnetwork/persistence/person/PersonServerTestKit.scala

@@ -5,7 +5,7 @@ import akka.actor.typed.ActorSystem
 import akka.http.scaladsl.model.StatusCodes
 import akka.http.scaladsl.server.Route
 import akka.http.scaladsl.testkit.PersistenceScalatestRouteTest
-import app.softnetwork.api.server.ApiRoutes
+import app.softnetwork.api.server.{ApiRoute, ApiRoutes}
 import app.softnetwork.api.server.config.ServerSettings.RootPath
 import app.softnetwork.persistence.launch.{PersistenceGuardian, PersistentEntity}
 import app.softnetwork.persistence.person.message._
@@ -46,7 +46,11 @@ trait PersonServerTestKit
       person2ExternalProcessorStream(sys)
     )
 
-  override def apiRoutes(system: ActorSystem[_]): Route = PersonService(system).route
+  override def apiRoutes: ActorSystem[_] => List[ApiRoute] =
+    system =>
+      List(
+        PersonService(system)
+      )
 
   val birthday = "26/12/1972"
 

server/testkit/src/main/scala/app/softnetwork/persistence/person/PersonService.scala

@@ -1,7 +1,6 @@
 package app.softnetwork.persistence.person
 
 import akka.actor.typed.ActorSystem
-import akka.http.scaladsl.server.Route
 import app.softnetwork.api.server.ApiEndpoint
 import app.softnetwork.persistence.generateUUID
 import app.softnetwork.persistence.person.message._
@@ -91,7 +90,6 @@ trait PersonService
     deletePersonEndpoint
   )
 
-  lazy val route: Route = apiRoute
 }
 
 object PersonService {

session/testkit/src/main/scala/app/softnetwork/session/scalatest/SessionEndpointsRoute.scala

@@ -1,7 +1,6 @@
 package app.softnetwork.session.scalatest
 
 import akka.actor.typed.ActorSystem
-import akka.http.scaladsl.server.{Route, RouteConcatenation}
 import app.softnetwork.api.server.ApiEndpoint
 import app.softnetwork.session.service._
 import com.softwaremill.session.{SessionEndpoints => _, _}
@@ -14,7 +13,7 @@ import sttp.tapir.server.ServerEndpoint
 
 import scala.concurrent.{ExecutionContext, Future}
 
-trait SessionEndpointsRoute extends TapirEndpoints with ApiEndpoint with RouteConcatenation {
+trait SessionEndpointsRoute extends TapirEndpoints with ApiEndpoint {
 
   import Session._
 
@@ -80,7 +79,6 @@ trait SessionEndpointsRoute extends TapirEndpoints with ApiEndpoint with RouteCo
   override def endpoints: List[ServerEndpoint[Any, Future]] =
     List(retrieveSessionEndpoint, invalidateSessionEndpoint, createSessionEndpoint)
 
-  lazy val route: Route = apiRoute ~ swaggerRoute
 }
 
 object SessionEndpointsRoute {