add support for tapir endpoints + update resource test kits

Author: fupelaqu

api/build.sbt

@@ -1,7 +1,7 @@
 import app.softnetwork.sbt.build._
 import com.typesafe.sbt.packager.docker._
 
-Compile / mainClass := Some("app.softnetwork.resource.api.ResourceToLocalFileSystemPostgresLauncher")
+Compile / mainClass := Some("app.softnetwork.resource.api.ResourceToLocalFileSystemEndpointsWithOneOffCookiePostgresLauncher")
 
 dockerBaseImage := "openjdk:8"
 
@@ -28,6 +28,5 @@ organization := "app.softnetwork.resource"
 name := "resource-api"
 
 libraryDependencies ++= Seq(
-  "app.softnetwork.persistence" %% "persistence-jdbc" % Versions.genericPersistence,
-  "com.lightbend.akka" %% "akka-persistence-jdbc" % Versions.akkaPersistenceJdbc
+  "app.softnetwork.persistence" %% "persistence-jdbc" % Versions.genericPersistence
 )

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

@@ -4,13 +4,13 @@ import akka.actor.typed.ActorSystem
 import app.softnetwork.persistence.launch.PersistentEntity
 import app.softnetwork.persistence.launch.PersistenceGuardian._
 import app.softnetwork.persistence.schema.SchemaProvider
-import app.softnetwork.resource.launch.GenericResourceApplication
+import app.softnetwork.resource.launch.ResourceApplication
 import app.softnetwork.resource.message.ResourceEvents.ResourceEvent
 import app.softnetwork.resource.message.ResourceMessages.{ResourceCommand, ResourceResult}
 import app.softnetwork.resource.model.Resource
 import app.softnetwork.resource.persistence.typed.ResourceBehavior
 
-trait ResourceApi extends GenericResourceApplication[Resource] { _: SchemaProvider =>
+trait ResourceApi extends ResourceApplication[Resource] { _: SchemaProvider =>
 
   override def resourceEntity
     : ActorSystem[_] => PersistentEntity[ResourceCommand, Resource, ResourceEvent, ResourceResult] =

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

@@ -8,7 +8,7 @@ import app.softnetwork.resource.persistence.query.{
   GenericResourceToExternalProcessorStream,
   ResourceToLocalFileSystemProcessorStream
 }
-import app.softnetwork.resource.service.{GenericResourceService, LocalFileSystemResourceService}
+import app.softnetwork.resource.service.{LocalFileSystemResourceService, ResourceService}
 import com.typesafe.config.Config
 
 trait ResourceToLocalFileSystemApi extends ResourceApi { _: SchemaProvider =>
@@ -21,7 +21,4 @@ trait ResourceToLocalFileSystemApi extends ResourceApi { _: SchemaProvider =>
         override implicit def system: ActorSystem[_] = sys
         override def config: Config = ResourceToLocalFileSystemApi.this.config
       }
-
-  override def resourceService: ActorSystem[_] => GenericResourceService = sys =>
-    LocalFileSystemResourceService(sys)
 }

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

@@ -0,0 +1,19 @@
+package app.softnetwork.resource.api
+
+import akka.actor.typed.ActorSystem
+import app.softnetwork.persistence.schema.SchemaProvider
+import app.softnetwork.resource.launch.ResourceEndpoints
+import app.softnetwork.resource.model.Resource
+import app.softnetwork.resource.service.{
+  LocalFileSystemResourceServiceEndpoints,
+  ResourceServiceEndpoints
+}
+import com.softwaremill.session.CsrfCheck
+
+trait ResourceToLocalFileSystemEndpointsApi
+    extends ResourceToLocalFileSystemApi
+    with ResourceEndpoints[Resource] { _: SchemaProvider with CsrfCheck =>
+
+  override def resourceEndpoints: ActorSystem[_] => ResourceServiceEndpoints = system =>
+    LocalFileSystemResourceServiceEndpoints(system, sessionEndpoints(system))
+}

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

@@ -0,0 +1,20 @@
+package app.softnetwork.resource.api
+
+import akka.actor.typed.ActorSystem
+import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
+import app.softnetwork.persistence.schema.SchemaType
+import app.softnetwork.session.service.{OneOffCookieSessionEndpoints, SessionEndpoints}
+import com.softwaremill.session.CsrfCheckHeader
+import org.slf4j.{Logger, LoggerFactory}
+
+object ResourceToLocalFileSystemEndpointsWithOneOffCookiePostgresLauncher
+    extends ResourceToLocalFileSystemEndpointsApi
+    with CsrfCheckHeader
+    with JdbcSchemaProvider {
+  lazy val log: Logger = LoggerFactory getLogger getClass.getName
+
+  def schemaType: SchemaType = JdbcSchemaTypes.Postgres
+
+  override def sessionEndpoints: ActorSystem[_] => SessionEndpoints = system =>
+    SessionEndpoints.oneOffCookie(system, checkHeaderAndForm)
+}

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

@@ -0,0 +1,15 @@
+package app.softnetwork.resource.api
+
+import akka.actor.typed.ActorSystem
+import app.softnetwork.persistence.schema.SchemaProvider
+import app.softnetwork.resource.launch.ResourceRoutes
+import app.softnetwork.resource.model.Resource
+import app.softnetwork.resource.service.{LocalFileSystemResourceService, ResourceService}
+
+trait ResourceToLocalFileSystemRoutesApi
+    extends ResourceToLocalFileSystemApi
+    with ResourceRoutes[Resource] { _: SchemaProvider =>
+
+  override def resourceService: ActorSystem[_] => ResourceService = system =>
+    LocalFileSystemResourceService(system, sessionService(system))
+}

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

@@ -0,0 +1,18 @@
+package app.softnetwork.resource.api
+
+import akka.actor.typed.ActorSystem
+import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
+import app.softnetwork.persistence.schema.SchemaType
+import app.softnetwork.session.service.SessionService
+import org.slf4j.{Logger, LoggerFactory}
+
+object ResourceToLocalFileSystemRoutesWithOneOffCookiePostgresLauncher
+    extends ResourceToLocalFileSystemRoutesApi
+    with JdbcSchemaProvider {
+  lazy val log: Logger = LoggerFactory getLogger getClass.getName
+
+  def schemaType: SchemaType = JdbcSchemaTypes.Postgres
+
+  override def sessionService: ActorSystem[_] => SessionService = system =>
+    SessionService.oneOffCookie(system)
+}

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

@@ -31,11 +31,11 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "resource"
 
-ThisBuild / version := "0.2.0.1"
+ThisBuild / version := "0.2.1"
 
 ThisBuild / scalaVersion := "2.12.15"
 
-ThisBuild / scalacOptions ++= Seq("-deprecation", "-feature", "-target:jvm-1.8")
+ThisBuild / scalacOptions ++= Seq("-deprecation", "-feature", "-target:jvm-1.8", "-Ypartial-unification")
 
 ThisBuild / javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint")
 

build.sbt

@@ -5,7 +5,7 @@ organization := "app.softnetwork.resource"
 name := "resource-common"
 
 libraryDependencies ++= Seq(
-  "app.softnetwork.api" %% "generic-server-api" % Versions.server,
+  "app.softnetwork.api" %% "generic-server-api" % Versions.genericPersistence,
   "app.softnetwork.protobuf" %% "scalapb-extensions" % "0.1.6"
 )