upgrade persistence dependencies

Author: fupelaqu

api/src/main/scala/app/softnetwork/resource/api/ResourceApi.scala

@@ -11,6 +11,10 @@ import app.softnetwork.resource.message.ResourceMessages.{ResourceCommand, Resou
 import app.softnetwork.resource.model.Resource
 import app.softnetwork.resource.persistence.typed.ResourceBehavior
 import app.softnetwork.session.CsrfCheck
+import app.softnetwork.session.config.Settings
+import app.softnetwork.session.model.SessionManagers
+import com.softwaremill.session.{SessionConfig, SessionManager}
+import org.softnetwork.session.model.Session
 
 trait ResourceApi extends ResourceApplication[Resource] { _: SchemaProvider with CsrfCheck =>
 
@@ -19,4 +23,13 @@ trait ResourceApi extends ResourceApplication[Resource] { _: SchemaProvider with
     _ => ResourceBehavior
 
   def resourceSwagger: ActorSystem[_] => SwaggerEndpoint
+
+  def sessionConfig: SessionConfig = Settings.Session.DefaultSessionConfig
+
+  override protected def sessionType: Session.SessionType =
+    Settings.Session.SessionContinuityAndTransport
+
+  override protected def manager(implicit sessionConfig: SessionConfig): SessionManager[Session] =
+    SessionManagers.basic
+
 }

api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemApi.scala

@@ -11,9 +11,14 @@ import app.softnetwork.resource.persistence.query.{
 }
 import app.softnetwork.resource.service.LocalFileSystemResourceServiceEndpoints
 import app.softnetwork.session.CsrfCheck
-import app.softnetwork.session.service.SessionEndpoints
+import app.softnetwork.session.config.Settings
+import app.softnetwork.session.service.SessionMaterials
+import com.softwaremill.session.{SessionConfig, SessionManager}
 import com.typesafe.config.Config
 import org.slf4j.{Logger, LoggerFactory}
+import org.softnetwork.session.model.Session
+
+import scala.concurrent.ExecutionContext
 
 trait ResourceToLocalFileSystemApi extends ResourceApi { self: SchemaProvider with CsrfCheck =>
   override def resourceToExternalProcessorStream
@@ -26,12 +31,18 @@ trait ResourceToLocalFileSystemApi extends ResourceApi { self: SchemaProvider wi
         override def config: Config = ResourceToLocalFileSystemApi.this.config
       }
 
-  def resourceSwagger: ActorSystem[_] => SwaggerEndpoint = sys =>
-    new LocalFileSystemResourceServiceEndpoints with SwaggerEndpoint {
-      override implicit def system: ActorSystem[_] = sys
-      lazy val log: Logger = LoggerFactory getLogger getClass.getName
-      override def sessionEndpoints: SessionEndpoints = self.sessionEndpoints(system)
-      override val applicationVersion: String = systemVersion()
-    }
+  def resourceSwagger: ActorSystem[_] => SwaggerEndpoint =
+    sys =>
+      new LocalFileSystemResourceServiceEndpoints with SwaggerEndpoint with SessionMaterials {
+        override implicit def system: ActorSystem[_] = sys
+        override lazy val ec: ExecutionContext = sys.executionContext
+        lazy val log: Logger = LoggerFactory getLogger getClass.getName
+        override implicit def sessionConfig: SessionConfig = self.sessionConfig
+        override protected def sessionType: Session.SessionType = self.sessionType
+        override implicit def manager(implicit
+          sessionConfig: SessionConfig
+        ): SessionManager[Session] = self.manager
+        override val applicationVersion: String = systemVersion()
+      }
 
 }

api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemEndpointsApi.scala

@@ -10,13 +10,29 @@ import app.softnetwork.resource.service.{
   ResourceServiceEndpoints
 }
 import app.softnetwork.session.CsrfCheck
+import app.softnetwork.session.service.SessionMaterials
+import com.softwaremill.session.{SessionConfig, SessionManager}
+import org.slf4j.{Logger, LoggerFactory}
+import org.softnetwork.session.model.Session
+
+import scala.concurrent.ExecutionContext
 
 trait ResourceToLocalFileSystemEndpointsApi
     extends ResourceToLocalFileSystemApi
-    with ResourceEndpoints[Resource] { _: SchemaProvider with CsrfCheck =>
+    with ResourceEndpoints[Resource] { self: SchemaProvider with CsrfCheck =>
 
-  override def resourceEndpoints: ActorSystem[_] => ResourceServiceEndpoints = system =>
-    LocalFileSystemResourceServiceEndpoints(system, sessionEndpoints(system))
+  override def resourceEndpoints: ActorSystem[_] => ResourceServiceEndpoints =
+    sys =>
+      new LocalFileSystemResourceServiceEndpoints with SessionMaterials {
+        override implicit def manager(implicit
+          sessionConfig: SessionConfig
+        ): SessionManager[Session] = self.manager
+        override protected def sessionType: Session.SessionType = self.sessionType
+        override def log: Logger = LoggerFactory getLogger getClass.getName
+        override implicit def system: ActorSystem[_] = sys
+        override implicit lazy val ec: ExecutionContext = sys.executionContext
+        override implicit def sessionConfig: SessionConfig = self.sessionConfig
+      }
 
   override def endpoints: ActorSystem[_] => List[Endpoint] = system =>
     super.endpoints(system) :+ resourceSwagger(system)

api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemRoutesApi.scala

@@ -7,14 +7,30 @@ import app.softnetwork.resource.launch.ResourceRoutes
 import app.softnetwork.resource.model.Resource
 import app.softnetwork.resource.service.{LocalFileSystemResourceService, ResourceService}
 import app.softnetwork.session.CsrfCheckHeader
+import app.softnetwork.session.service.SessionMaterials
+import com.softwaremill.session.{SessionConfig, SessionManager}
+import org.slf4j.{Logger, LoggerFactory}
+import org.softnetwork.session.model.Session
+
+import scala.concurrent.ExecutionContext
 
 trait ResourceToLocalFileSystemRoutesApi
     extends ResourceToLocalFileSystemApi
     with ResourceRoutes[Resource]
-    with CsrfCheckHeader { _: SchemaProvider =>
+    with CsrfCheckHeader { self: SchemaProvider =>
 
-  override def resourceService: ActorSystem[_] => ResourceService = system =>
-    LocalFileSystemResourceService(system, sessionService(system))
+  override def resourceService: ActorSystem[_] => ResourceService =
+    sys =>
+      new LocalFileSystemResourceService with SessionMaterials {
+        override implicit def manager(implicit
+          sessionConfig: SessionConfig
+        ): SessionManager[Session] = self.manager
+        override protected def sessionType: Session.SessionType = self.sessionType
+        override def log: Logger = LoggerFactory getLogger getClass.getName
+        override implicit def system: ActorSystem[_] = sys
+        override implicit lazy val ec: ExecutionContext = sys.executionContext
+        override implicit def sessionConfig: SessionConfig = self.sessionConfig
+      }
 
   override def apiRoutes: ActorSystem[_] => List[ApiRoute] = system =>
     super.apiRoutes(system) :+ resourceSwagger(system)

build.sbt

@@ -2,7 +2,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "resource"
 
-ThisBuild / version := "0.3.0"
+ThisBuild / version := "0.4.0"
 
 ThisBuild / scalaVersion := "2.12.18"
 

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

@@ -1,24 +1,10 @@
 package app.softnetwork.resource.service
 
-import akka.actor.typed.ActorSystem
 import app.softnetwork.resource.handlers.ResourceHandler
 import app.softnetwork.resource.spi.LocalFileSystemProvider
-import app.softnetwork.session.service.SessionService
-import org.slf4j.{Logger, LoggerFactory}
+import app.softnetwork.session.service.SessionMaterials
 
 trait LocalFileSystemResourceService
     extends ResourceService
     with LocalFileSystemProvider
-    with ResourceHandler
-
-object LocalFileSystemResourceService {
-  def apply(
-    aSystem: ActorSystem[_],
-    aSessionService: SessionService
-  ): LocalFileSystemResourceService =
-    new LocalFileSystemResourceService {
-      override implicit def system: ActorSystem[_] = aSystem
-      override def sessionService: SessionService = aSessionService
-      lazy val log: Logger = LoggerFactory getLogger getClass.getName
-    }
-}
+    with ResourceHandler { _: SessionMaterials => }

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

@@ -1,24 +1,10 @@
 package app.softnetwork.resource.service
 
-import akka.actor.typed.ActorSystem
 import app.softnetwork.resource.handlers.ResourceHandler
 import app.softnetwork.resource.spi.LocalFileSystemProvider
-import app.softnetwork.session.service.SessionEndpoints
-import org.slf4j.{Logger, LoggerFactory}
+import app.softnetwork.session.service.SessionMaterials
 
 trait LocalFileSystemResourceServiceEndpoints
     extends ResourceServiceEndpoints
     with LocalFileSystemProvider
-    with ResourceHandler
-
-object LocalFileSystemResourceServiceEndpoints {
-  def apply(
-    _system: ActorSystem[_],
-    _sessionEndpoints: SessionEndpoints
-  ): LocalFileSystemResourceServiceEndpoints =
-    new LocalFileSystemResourceServiceEndpoints {
-      override implicit def system: ActorSystem[_] = _system
-      lazy val log: Logger = LoggerFactory getLogger getClass.getName
-      override def sessionEndpoints: SessionEndpoints = _sessionEndpoints
-    }
-}
+    with ResourceHandler { _: SessionMaterials => }

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

@@ -1,5 +1,6 @@
 package app.softnetwork.resource.service
 
+import akka.actor.typed.ActorSystem
 import akka.http.scaladsl.model.{HttpResponse, StatusCodes}
 import akka.http.scaladsl.server.{Directives, Route}
 import akka.stream.Materializer
@@ -11,10 +12,11 @@ import app.softnetwork.resource.handlers.GenericResourceHandler
 import app.softnetwork.resource.message.ResourceMessages._
 import com.softwaremill.session.CsrfDirectives._
 import com.softwaremill.session.CsrfOptions._
-import org.softnetwork.session.model.Session._
 import app.softnetwork.resource.spi._
 import app.softnetwork.serialization.commonFormats
-import app.softnetwork.session.service.SessionService
+import app.softnetwork.session.config.Settings
+import app.softnetwork.session.service.{ServiceWithSessionDirectives, SessionMaterials}
+import com.softwaremill.session.SessionConfig
 import com.typesafe.scalalogging.StrictLogging
 import de.heikoseeberger.akkahttpjson4s.Json4sSupport
 import org.json4s.{jackson, Formats}
@@ -27,15 +29,18 @@ trait ResourceService
     with DefaultComplete
     with Json4sSupport
     with StrictLogging
+    with ServiceWithSessionDirectives[ResourceCommand, ResourceResult]
     with LoadResourceService
     with ApiRoute {
-  _: GenericResourceHandler with ResourceProvider =>
+  _: GenericResourceHandler with ResourceProvider with SessionMaterials =>
 
   implicit def serialization: Serialization.type = jackson.Serialization
 
   implicit def formats: Formats = commonFormats
 
-  def sessionService: SessionService
+  implicit def sessionConfig: SessionConfig = Settings.Session.DefaultSessionConfig
+
+  override implicit def ts: ActorSystem[_] = system
 
   val route: Route = {
     pathPrefix(ResourceSettings.ResourcePath) {
@@ -70,7 +75,7 @@ trait ResourceService
       // check anti CSRF token
       hmacTokenCsrfProtection(checkHeader) {
         // check if a session exists
-        sessionService.requiredSession { session =>
+        requiredSession(sc, gt) { session =>
           post {
             extractRequestContext { ctx =>
               implicit val materializer: Materializer = ctx.materializer

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

@@ -1,13 +1,16 @@
 package app.softnetwork.resource.service
 
+import akka.actor.typed.ActorSystem
 import akka.stream.scaladsl.{FileIO, Source}
 import akka.util.ByteString
-import app.softnetwork.api.server.{ApiErrors, SwaggerApiEndpoint}
+import app.softnetwork.api.server.ApiErrors
 import app.softnetwork.resource.config.ResourceSettings
 import app.softnetwork.resource.handlers.GenericResourceHandler
 import app.softnetwork.resource.message.ResourceMessages._
 import app.softnetwork.resource.spi.{ResourceProvider, SimpleResource}
-import app.softnetwork.session.service.ServiceWithSessionEndpoints
+import app.softnetwork.session.config.Settings
+import app.softnetwork.session.service.{ServiceWithSessionEndpoints, SessionMaterials}
+import com.softwaremill.session.SessionConfig
 import org.apache.tika.mime.MediaType
 import org.softnetwork.session.model.Session
 import sttp.capabilities.akka.AkkaStreams
@@ -22,10 +25,14 @@ import scala.concurrent.Future
 trait ResourceServiceEndpoints
     extends LoadResourceService
     with ServiceWithSessionEndpoints[ResourceCommand, ResourceResult] {
-  _: GenericResourceHandler with ResourceProvider =>
+  _: GenericResourceHandler with ResourceProvider with SessionMaterials =>
 
   import app.softnetwork.serialization._
 
+  implicit def sessionConfig: SessionConfig
+
+  override implicit def ts: ActorSystem[_] = system
+
   def error(e: ResourceError): ApiErrors.ErrorInfo =
     e match {
       case ResourceNotFound => ApiErrors.NotFound(ResourceNotFound)

project/Versions.scala

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