upgrade generic persistence dependencies, migrate to tapir-http-session

fupelaqu · fupelaqu · commit 8b379f650b2e · 2023-10-13T08:20:01.000+02:00
diff --git a/api/build.sbt b/api/build.sbt
@@ -1,4 +1,3 @@
-import app.softnetwork.sbt.build._
 import com.typesafe.sbt.packager.docker._
 
 Compile / mainClass := Some("app.softnetwork.resource.api.ResourceToLocalFileSystemEndpointsWithOneOffCookiePostgresLauncher")
diff --git a/api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemEndpointsApi.scala b/api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemEndpointsApi.scala
@@ -8,7 +8,7 @@ import app.softnetwork.resource.service.{
   LocalFileSystemResourceServiceEndpoints,
   ResourceServiceEndpoints
 }
-import com.softwaremill.session.CsrfCheck
+import app.softnetwork.session.CsrfCheck
 
 trait ResourceToLocalFileSystemEndpointsApi
     extends ResourceToLocalFileSystemApi
diff --git a/api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemEndpointsWithOneOffCookiePostgresLauncher.scala b/api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemEndpointsWithOneOffCookiePostgresLauncher.scala
@@ -3,8 +3,8 @@ 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 app.softnetwork.session.CsrfCheckHeader
+import app.softnetwork.session.service.SessionEndpoints
 import org.slf4j.{Logger, LoggerFactory}
 
 object ResourceToLocalFileSystemEndpointsWithOneOffCookiePostgresLauncher
diff --git a/build.sbt b/build.sbt
@@ -1,39 +1,10 @@
-import sbt.Resolver
-
-import Common._
-import app.softnetwork.sbt.build._
-
-/////////////////////////////////
-// Defaults
-/////////////////////////////////
-
-app.softnetwork.sbt.build.Publication.settings
-
-/////////////////////////////////
-// Useful aliases
-/////////////////////////////////
-
-addCommandAlias("cd", "project") // navigate the projects
-
-addCommandAlias("cc", ";clean;compile") // clean and compile
-
-addCommandAlias("pl", ";clean;publishLocal") // clean and publish locally
-
-addCommandAlias("pr", ";clean;publish") // clean and publish globally
-
-addCommandAlias("pld", ";clean;local:publishLocal;dockerComposeUp") // clean and publish/launch the docker environment
-
-addCommandAlias("dct", ";dockerComposeTest") // navigate the projects
-
-ThisBuild / shellPrompt := prompt
-
 ThisBuild / organization := "app.softnetwork"
 
 name := "resource"
 
-ThisBuild / version := "0.2.5.2"
+ThisBuild / version := "0.3.0"
 
-ThisBuild / scalaVersion := "2.12.15"
+ThisBuild / scalaVersion := "2.12.18"
 
 ThisBuild / scalacOptions ++= Seq("-deprecation", "-feature", "-target:jvm-1.8", "-Ypartial-unification")
 
@@ -65,7 +36,7 @@ lazy val common = project.in(file("common"))
 
 lazy val core = project.in(file("core"))
   .configs(IntegrationTest)
-  .settings(Defaults.itSettings, BuildInfoSettings.settings)
+  .settings(Defaults.itSettings, app.softnetwork.Info.infoSettings)
   .enablePlugins(BuildInfoPlugin)
   .dependsOn(
     common % "compile->compile;test->test;it->it"
@@ -74,15 +45,14 @@ lazy val core = project.in(file("core"))
 lazy val testkit = project.in(file("testkit"))
   .configs(IntegrationTest)
   .settings(Defaults.itSettings)
-  .enablePlugins(BuildInfoPlugin)
   .dependsOn(
     core % "compile->compile;test->test;it->it"
   )
 
 lazy val api = project.in(file("api"))
   .configs(IntegrationTest)
-  .settings(Defaults.itSettings, BuildInfoSettings.settings)
-  .enablePlugins(DockerComposePlugin, DockerPlugin, JavaAppPackaging, BuildInfoPlugin)
+  .settings(Defaults.itSettings)
+  .enablePlugins(DockerPlugin, JavaAppPackaging)
   .dependsOn(
     core % "compile->compile;test->test;it->it"
   )
diff --git a/common/build.sbt b/common/build.sbt
@@ -1,5 +1,3 @@
-import app.softnetwork.sbt.build._
-
 organization := "app.softnetwork.resource"
 
 name := "resource-common"
diff --git a/core/build.sbt b/core/build.sbt
@@ -1,5 +1,3 @@
-import app.softnetwork.sbt.build._
-
 organization := "app.softnetwork.resource"
 
 name := "resource-core"
diff --git a/core/src/main/scala/app/softnetwork/resource/launch/ResourceEndpoints.scala b/core/src/main/scala/app/softnetwork/resource/launch/ResourceEndpoints.scala
@@ -1,12 +1,12 @@
 package app.softnetwork.resource.launch
 
 import akka.actor.typed.ActorSystem
-import app.softnetwork.api.server.{ApiEndpoint, ApiEndpoints}
+import app.softnetwork.api.server.{ApiEndpoints, Endpoint}
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.resource.model.GenericResource
 import app.softnetwork.resource.service.ResourceServiceEndpoints
+import app.softnetwork.session.CsrfCheck
 import app.softnetwork.session.service.SessionEndpoints
-import com.softwaremill.session.CsrfCheck
 
 trait ResourceEndpoints[Resource <: GenericResource]
     extends ApiEndpoints
@@ -16,7 +16,7 @@ trait ResourceEndpoints[Resource <: GenericResource]
 
   def resourceEndpoints: ActorSystem[_] => ResourceServiceEndpoints
 
-  override def endpoints: ActorSystem[_] => List[ApiEndpoint] =
+  override def endpoints: ActorSystem[_] => List[Endpoint] =
     system =>
       List(
         resourceEndpoints(system)
diff --git a/core/src/main/scala/app/softnetwork/resource/launch/ResourceGuardian.scala b/core/src/main/scala/app/softnetwork/resource/launch/ResourceGuardian.scala
@@ -5,6 +5,7 @@ import app.softnetwork.persistence.launch.{PersistenceGuardian, PersistentEntity
 import app.softnetwork.persistence.query.EventProcessorStream
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.persistence.typed.Singleton
+import app.softnetwork.resource.ResourceCoreBuildInfo
 import app.softnetwork.resource.message.ResourceEvents.ResourceEvent
 import app.softnetwork.resource.message.ResourceMessages.{ResourceCommand, ResourceResult}
 import app.softnetwork.resource.model.GenericResource
@@ -36,4 +37,6 @@ trait ResourceGuardian[Resource <: GenericResource] extends PersistenceGuardian
       resourceToExternalProcessorStream(sys)
     )
 
+  override def systemVersion(): String =
+    sys.env.getOrElse("VERSION", ResourceCoreBuildInfo.version)
 }
diff --git a/core/src/main/scala/app/softnetwork/resource/service/ResourceServiceEndpoints.scala b/core/src/main/scala/app/softnetwork/resource/service/ResourceServiceEndpoints.scala
@@ -2,7 +2,7 @@ package app.softnetwork.resource.service
 
 import akka.stream.scaladsl.{FileIO, Source}
 import akka.util.ByteString
-import app.softnetwork.api.server.ApiErrors
+import app.softnetwork.api.server.{ApiErrors, SwaggerApiEndpoint}
 import app.softnetwork.resource.config.ResourceSettings
 import app.softnetwork.resource.handlers.GenericResourceHandler
 import app.softnetwork.resource.message.ResourceMessages._
@@ -21,7 +21,8 @@ import scala.concurrent.Future
 
 trait ResourceServiceEndpoints
     extends LoadResourceService
-    with ServiceWithSessionEndpoints[ResourceCommand, ResourceResult] {
+    with ServiceWithSessionEndpoints[ResourceCommand, ResourceResult]
+    with SwaggerApiEndpoint {
   _: GenericResourceHandler with ResourceProvider =>
 
   import app.softnetwork.serialization._
diff --git a/project/Common.scala b/project/Common.scala
diff --git a/project/Versions.scala b/project/Versions.scala
@@ -0,0 +1,6 @@
+object Versions {
+
+  val genericPersistence = "0.4.0"
+
+  val scalatest = "3.2.16"
+}
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,19 +1,22 @@
 logLevel := Level.Warn
 
-resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/"
+libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.2")
+resolvers ++= Seq(
+  "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/",
+  "Softnetwork releases" at "https://softnetwork.jfrog.io/artifactory/releases/"
+)
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.10")
+addSbtPlugin("app.softnetwork.sbt-softnetwork" % "sbt-softnetwork-git" % "0.1.7")
+
+addSbtPlugin("app.softnetwork.sbt-softnetwork" % "sbt-softnetwork-info" % "0.1.7")
 
-addSbtPlugin("com.tapad" % "sbt-docker-compose" % "1.0.34")
+addSbtPlugin("app.softnetwork.sbt-softnetwork" % "sbt-softnetwork-publish" % "0.1.7")
 
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.10")
 
-addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1")
+addDependencyTreePlugin
 
 //addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.4.0")
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
-
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
diff --git a/project/src/main/scala/app/softnetwork/sbt/build/BuildInfoSettings.scala b/project/src/main/scala/app/softnetwork/sbt/build/BuildInfoSettings.scala
diff --git a/project/src/main/scala/app/softnetwork/sbt/build/ConsoleUtils.scala b/project/src/main/scala/app/softnetwork/sbt/build/ConsoleUtils.scala
diff --git a/project/src/main/scala/app/softnetwork/sbt/build/GitSupport.scala b/project/src/main/scala/app/softnetwork/sbt/build/GitSupport.scala
diff --git a/project/src/main/scala/app/softnetwork/sbt/build/Publication.scala b/project/src/main/scala/app/softnetwork/sbt/build/Publication.scala
diff --git a/project/src/main/scala/app/softnetwork/sbt/build/Utils.scala b/project/src/main/scala/app/softnetwork/sbt/build/Utils.scala
diff --git a/project/src/main/scala/app/softnetwork/sbt/build/Versions.scala b/project/src/main/scala/app/softnetwork/sbt/build/Versions.scala
diff --git a/testkit/build.sbt b/testkit/build.sbt
@@ -1,5 +1,3 @@
-import app.softnetwork.sbt.build.Versions
-
 Test / parallelExecution := false
 
 organization := "app.softnetwork.resource"
@@ -8,5 +6,6 @@ name := "resource-testkit"
 
 libraryDependencies ++= Seq(
   "app.softnetwork.api" %% "generic-server-api-testkit" % Versions.genericPersistence,
-  "app.softnetwork.session" %% "session-testkit" % Versions.genericPersistence
+  "app.softnetwork.session" %% "session-testkit" % Versions.genericPersistence,
+  "org.scalatest" %% "scalatest" % Versions.scalatest
 )
diff --git a/testkit/src/main/scala/app/softnetwork/resource/scalatest/ResourceEndpointsTestKit.scala b/testkit/src/main/scala/app/softnetwork/resource/scalatest/ResourceEndpointsTestKit.scala
@@ -5,8 +5,8 @@ import app.softnetwork.api.server.ApiEndpoint
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.resource.launch.ResourceEndpoints
 import app.softnetwork.resource.model.GenericResource
+import app.softnetwork.session.CsrfCheck
 import app.softnetwork.session.scalatest.SessionEndpointsRoutes
-import com.softwaremill.session.CsrfCheck
 
 trait ResourceEndpointsTestKit[Resource <: GenericResource]
     extends ResourceEndpoints[Resource]
diff --git a/testkit/src/main/scala/app/softnetwork/resource/scalatest/ResourceToLocalFileSystemEndpointsTestKit.scala b/testkit/src/main/scala/app/softnetwork/resource/scalatest/ResourceToLocalFileSystemEndpointsTestKit.scala
@@ -6,7 +6,7 @@ import app.softnetwork.resource.service.{
   LocalFileSystemResourceServiceEndpoints,
   ResourceServiceEndpoints
 }
-import com.softwaremill.session.CsrfCheck
+import app.softnetwork.session.CsrfCheck
 import org.scalatest.Suite
 
 trait ResourceToLocalFileSystemEndpointsTestKit
diff --git a/testkit/src/test/scala/app/softnetwork/resource/service/ResourceToLocalFileSystemEndpointsWithOneOffCookieSessionSpec.scala b/testkit/src/test/scala/app/softnetwork/resource/service/ResourceToLocalFileSystemEndpointsWithOneOffCookieSessionSpec.scala
@@ -1,8 +1,8 @@
 package app.softnetwork.resource.service
 
 import app.softnetwork.resource.scalatest.ResourceToLocalFileSystemEndpointsTestKit
+import app.softnetwork.session.CsrfCheckHeader
 import app.softnetwork.session.scalatest.OneOffCookieSessionEndpointsTestKit
-import com.softwaremill.session.CsrfCheckHeader
 
 class ResourceToLocalFileSystemEndpointsWithOneOffCookieSessionSpec
     extends ResourceServiceSpec
diff --git a/testkit/src/test/scala/app/softnetwork/resource/service/ResourceToLocalFileSystemEndpointsWithOneOffHeaderSessionSpec.scala b/testkit/src/test/scala/app/softnetwork/resource/service/ResourceToLocalFileSystemEndpointsWithOneOffHeaderSessionSpec.scala
@@ -1,8 +1,8 @@
 package app.softnetwork.resource.service
 
 import app.softnetwork.resource.scalatest.ResourceToLocalFileSystemEndpointsTestKit
+import app.softnetwork.session.CsrfCheckHeader
 import app.softnetwork.session.scalatest.OneOffHeaderSessionEndpointsTestKit
-import com.softwaremill.session.CsrfCheckHeader
 
 class ResourceToLocalFileSystemEndpointsWithOneOffHeaderSessionSpec
     extends ResourceServiceSpec
diff --git a/testkit/src/test/scala/app/softnetwork/resource/service/ResourceToLocalFileSystemEndpointsWithRefreshableCookieSessionSpec.scala b/testkit/src/test/scala/app/softnetwork/resource/service/ResourceToLocalFileSystemEndpointsWithRefreshableCookieSessionSpec.scala
@@ -1,8 +1,8 @@
 package app.softnetwork.resource.service
 
 import app.softnetwork.resource.scalatest.ResourceToLocalFileSystemEndpointsTestKit
+import app.softnetwork.session.CsrfCheckHeader
 import app.softnetwork.session.scalatest.RefreshableCookieSessionEndpointsTestKit
-import com.softwaremill.session.CsrfCheckHeader
 
 class ResourceToLocalFileSystemEndpointsWithRefreshableCookieSessionSpec
     extends ResourceServiceSpec
diff --git a/testkit/src/test/scala/app/softnetwork/resource/service/ResourceToLocalFileSystemEndpointsWithRefreshableHeaderSessionSpec.scala b/testkit/src/test/scala/app/softnetwork/resource/service/ResourceToLocalFileSystemEndpointsWithRefreshableHeaderSessionSpec.scala

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import app.softnetwork.sbt.build._`
`2`	`1`	`import com.typesafe.sbt.packager.docker._`
`3`	`2`
`4`	`3`	`Compile / mainClass := Some("app.softnetwork.resource.api.ResourceToLocalFileSystemEndpointsWithOneOffCookiePostgresLauncher")`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import app.softnetwork.resource.service.{`
`8`	`8`	`LocalFileSystemResourceServiceEndpoints,`
`9`	`9`	`ResourceServiceEndpoints`
`10`	`10`	`}`
`11`		`-import com.softwaremill.session.CsrfCheck`
	`11`	`+import app.softnetwork.session.CsrfCheck`
`12`	`12`
`13`	`13`	`trait ResourceToLocalFileSystemEndpointsApi`
`14`	`14`	`extends ResourceToLocalFileSystemApi`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import app.softnetwork.sbt.build._`
`2`		`-`
`3`	`1`	`organization := "app.softnetwork.resource"`
`4`	`2`
`5`	`3`	`name := "resource-common"`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import app.softnetwork.persistence.launch.{PersistenceGuardian, PersistentEntity`
`5`	`5`	`import app.softnetwork.persistence.query.EventProcessorStream`
`6`	`6`	`import app.softnetwork.persistence.schema.SchemaProvider`
`7`	`7`	`import app.softnetwork.persistence.typed.Singleton`
	`8`	`+import app.softnetwork.resource.ResourceCoreBuildInfo`
`8`	`9`	`import app.softnetwork.resource.message.ResourceEvents.ResourceEvent`
`9`	`10`	`import app.softnetwork.resource.message.ResourceMessages.{ResourceCommand, ResourceResult}`
`10`	`11`	`import app.softnetwork.resource.model.GenericResource`
`@@ -36,4 +37,6 @@ trait ResourceGuardian[Resource <: GenericResource] extends PersistenceGuardian`
`36`	`37`	`resourceToExternalProcessorStream(sys)`
`37`	`38`	`)`
`38`	`39`
	`40`	`+ override def systemVersion(): String =`
	`41`	`+ sys.env.getOrElse("VERSION", ResourceCoreBuildInfo.version)`
`39`	`42`	`}`