upgrade persistence dependencies

fupelaqu · fupelaqu · commit 9c8c9e370e5b · 2023-05-02T17:31:37.000+02:00
diff --git a/api/src/main/scala/app/softnetwork/resource/api/ResourceApi.scala b/api/src/main/scala/app/softnetwork/resource/api/ResourceApi.scala
@@ -1,8 +1,6 @@
 package app.softnetwork.resource.api
 
 import akka.actor.typed.ActorSystem
-import app.softnetwork.persistence.jdbc.query.JdbcSchema.SchemaType
-import app.softnetwork.persistence.jdbc.query.JdbcSchemaProvider
 import app.softnetwork.persistence.launch.PersistentEntity
 import app.softnetwork.persistence.launch.PersistenceGuardian._
 import app.softnetwork.resource.launch.GenericResourceApplication
@@ -11,8 +9,7 @@ import app.softnetwork.resource.message.ResourceMessages.{ResourceCommand, Resou
 import app.softnetwork.resource.model.Resource
 import app.softnetwork.resource.persistence.typed.ResourceBehavior
 
-trait ResourceApi extends GenericResourceApplication[Resource] with JdbcSchemaProvider {
-  def jdbcSchemaType: SchemaType = this.schemaType
+trait ResourceApi extends GenericResourceApplication[Resource] {
 
   override def resourceEntity
     : ActorSystem[_] => PersistentEntity[ResourceCommand, Resource, ResourceEvent, ResourceResult] =
diff --git a/api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemApi.scala b/api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemApi.scala
@@ -1,23 +1,24 @@
 package app.softnetwork.resource.api
 
 import akka.actor.typed.ActorSystem
-import app.softnetwork.persistence.jdbc.query.{JdbcJournalProvider, JdbcSchema, JdbcSchemaProvider}
+import app.softnetwork.persistence.jdbc.query.{JdbcJournalProvider, JdbcOffsetProvider}
 import app.softnetwork.resource.model.Resource
 import app.softnetwork.resource.persistence.query.{
   GenericResourceToExternalProcessorStream,
   ResourceToLocalFileSystemProcessorStream
 }
 import app.softnetwork.resource.service.{GenericResourceService, LocalFileSystemResourceService}
+import com.typesafe.config.Config
 
 trait ResourceToLocalFileSystemApi extends ResourceApi {
   override def resourceToExternalProcessorStream
     : ActorSystem[_] => GenericResourceToExternalProcessorStream[Resource] =
     sys =>
       new ResourceToLocalFileSystemProcessorStream()
         with JdbcJournalProvider
-        with JdbcSchemaProvider {
+        with JdbcOffsetProvider {
         override implicit val system: ActorSystem[_] = sys
-        override def schemaType: JdbcSchema.SchemaType = jdbcSchemaType
+        override def config: Config = ResourceToLocalFileSystemApi.this.config
       }
 
   override def resourceService: ActorSystem[_] => GenericResourceService = sys =>
diff --git a/api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemPostgresLauncher.scala b/api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemPostgresLauncher.scala
@@ -1,7 +1,17 @@
 package app.softnetwork.resource.api
 
-import app.softnetwork.persistence.jdbc.query.PostgresSchemaProvider
+import akka.actor.ActorSystem
+import app.softnetwork.persistence.jdbc.schema.PostgresSchemaProvider
+import app.softnetwork.persistence.typed._
+import com.typesafe.config.Config
+import org.slf4j.{Logger, LoggerFactory}
 
-object ResourceToLocalFileSystemPostgresLauncher
-    extends ResourceToLocalFileSystemApi
-    with PostgresSchemaProvider
+object ResourceToLocalFileSystemPostgresLauncher extends ResourceToLocalFileSystemApi {
+  lazy val log: Logger = LoggerFactory getLogger getClass.getName
+
+  override def schemaProvider = sys =>
+    new PostgresSchemaProvider {
+      override implicit def classicSystem: ActorSystem = sys
+      override def config: Config = ResourceToLocalFileSystemPostgresLauncher.this.config
+    }
+}
diff --git a/build.sbt b/build.sbt
@@ -31,7 +31,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "resource"
 
-ThisBuild / version := "0.1.7"
+ThisBuild / version := "0.2.0"
 
 ThisBuild / scalaVersion := "2.12.15"
 
diff --git a/common/src/main/protobuf/model/resource.proto b/common/src/main/protobuf/model/resource.proto
@@ -26,8 +26,8 @@ message Resource {
     option (scalapb.message).extends = "ProtobufDomainObject";
     option (scalapb.message).extends = "GenericResource";
     required string uuid = 1;
-    required google.protobuf.Timestamp createdDate = 2 [(scalapb.field).type = "java.util.Date"];
-    required google.protobuf.Timestamp lastUpdated = 3 [(scalapb.field).type = "java.util.Date"];
+    required google.protobuf.Timestamp createdDate = 2 [(scalapb.field).type = "java.time.Instant"];
+    required google.protobuf.Timestamp lastUpdated = 3 [(scalapb.field).type = "java.time.Instant"];
     required string content = 4;
     required string md5 = 5;
     optional string mimetype = 6;
diff --git a/core/src/main/scala/app/softnetwork/resource/handlers/ResourceHandler.scala b/core/src/main/scala/app/softnetwork/resource/handlers/ResourceHandler.scala
@@ -5,7 +5,6 @@ import app.softnetwork.persistence.typed.scaladsl.EntityPattern
 import app.softnetwork.resource.message.ResourceMessages._
 import app.softnetwork.resource.persistence.typed.ResourceBehavior
 import app.softnetwork.persistence.typed.CommandTypeKey
-import app.softnetwork.resource.spi.LocalFileSystemProvider
 
 import scala.language.implicitConversions
 import scala.reflect.ClassTag
diff --git a/core/src/main/scala/app/softnetwork/resource/launch/GenericResourceApplication.scala b/core/src/main/scala/app/softnetwork/resource/launch/GenericResourceApplication.scala
@@ -1,9 +1,8 @@
 package app.softnetwork.resource.launch
 
 import app.softnetwork.api.server.launch.Application
-import app.softnetwork.persistence.query.SchemaProvider
 import app.softnetwork.resource.model.GenericResource
 
 trait GenericResourceApplication[Resource <: GenericResource]
     extends Application
-    with GenericResourceRoutes[Resource] { _: SchemaProvider => }
+    with GenericResourceRoutes[Resource]
diff --git a/core/src/main/scala/app/softnetwork/resource/launch/GenericResourceGuardian.scala b/core/src/main/scala/app/softnetwork/resource/launch/GenericResourceGuardian.scala
@@ -2,7 +2,7 @@ package app.softnetwork.resource.launch
 
 import akka.actor.typed.ActorSystem
 import app.softnetwork.persistence.launch.{PersistenceGuardian, PersistentEntity}
-import app.softnetwork.persistence.query.{EventProcessorStream, SchemaProvider}
+import app.softnetwork.persistence.query.EventProcessorStream
 import app.softnetwork.persistence.typed.Singleton
 import app.softnetwork.resource.message.ResourceEvents.ResourceEvent
 import app.softnetwork.resource.message.ResourceMessages.{ResourceCommand, ResourceResult}
@@ -13,7 +13,6 @@ import com.typesafe.scalalogging.StrictLogging
 trait GenericResourceGuardian[Resource <: GenericResource]
     extends PersistenceGuardian
     with StrictLogging {
-  _: SchemaProvider =>
 
   def resourceEntity
     : ActorSystem[_] => PersistentEntity[ResourceCommand, Resource, ResourceEvent, ResourceResult]
diff --git a/core/src/main/scala/app/softnetwork/resource/launch/GenericResourceRoutes.scala b/core/src/main/scala/app/softnetwork/resource/launch/GenericResourceRoutes.scala
@@ -3,14 +3,12 @@ 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.persistence.query.SchemaProvider
 import app.softnetwork.resource.model.GenericResource
 import app.softnetwork.resource.service.GenericResourceService
 
 trait GenericResourceRoutes[Resource <: GenericResource]
     extends ApiRoutes
     with GenericResourceGuardian[Resource] {
-  _: SchemaProvider =>
 
   def resourceService: ActorSystem[_] => GenericResourceService
 
diff --git a/core/src/main/scala/app/softnetwork/resource/persistence/query/GenericResourceToExternalProcessorStream.scala b/core/src/main/scala/app/softnetwork/resource/persistence/query/GenericResourceToExternalProcessorStream.scala
@@ -4,6 +4,7 @@ import app.softnetwork.persistence.ManifestWrapper
 import app.softnetwork.persistence.query.{
   ExternalPersistenceProvider,
   JournalProvider,
+  OffsetProvider,
   State2ExternalProcessorStream
 }
 import app.softnetwork.resource.message.ResourceEvents.ResourceEvent
@@ -12,7 +13,7 @@ import app.softnetwork.resource.model.GenericResource
 trait GenericResourceToExternalProcessorStream[Resource <: GenericResource]
     extends State2ExternalProcessorStream[Resource, ResourceEvent]
     with ManifestWrapper[Resource] {
-  _: JournalProvider with ExternalPersistenceProvider[Resource] =>
+  _: JournalProvider with OffsetProvider with ExternalPersistenceProvider[Resource] =>
 
   override val externalProcessor = "resource"
 }
diff --git a/core/src/main/scala/app/softnetwork/resource/persistence/query/LocalFileSystemResourceProvider.scala b/core/src/main/scala/app/softnetwork/resource/persistence/query/LocalFileSystemResourceProvider.scala
@@ -48,8 +48,8 @@ protected[resource] trait LocalFileSystemResourceProvider
             .withUuid(uuid)
             .withContent(content)
             .withMd5(md5)
-            .withCreatedDate(new Date(fileAttributes.creationTime().toMillis))
-            .withLastUpdated(new Date(fileAttributes.lastModifiedTime().toMillis))
+            .withCreatedDate(fileAttributes.creationTime().toInstant)
+            .withLastUpdated(fileAttributes.lastModifiedTime().toInstant)
             .copy(mimetype = MimeTypeTools.detectMimeType(path))
         )
       } else {
diff --git a/core/src/main/scala/app/softnetwork/resource/persistence/query/ResourceToLocalFileSystemProcessorStream.scala b/core/src/main/scala/app/softnetwork/resource/persistence/query/ResourceToLocalFileSystemProcessorStream.scala
@@ -1,11 +1,11 @@
 package app.softnetwork.resource.persistence.query
 
-import app.softnetwork.persistence.query.JournalProvider
+import app.softnetwork.persistence.query.{JournalProvider, OffsetProvider}
 import app.softnetwork.resource.model.Resource
 
 trait ResourceToLocalFileSystemProcessorStream
     extends GenericResourceToExternalProcessorStream[Resource]
-    with LocalFileSystemResourceProvider { _: JournalProvider =>
+    with LocalFileSystemResourceProvider { _: JournalProvider with OffsetProvider =>
   override val externalProcessor: String = "localfilesystem"
   override protected val manifestWrapper: ManifestW = ManifestW()
 }
diff --git a/core/src/main/scala/app/softnetwork/resource/persistence/typed/ResourceBehavior.scala b/core/src/main/scala/app/softnetwork/resource/persistence/typed/ResourceBehavior.scala
@@ -15,6 +15,7 @@ import app.softnetwork.utils.{Base64Tools, HashTools}
 import org.apache.tika.Tika
 
 import java.io.ByteArrayInputStream
+import java.time.Instant
 import scala.util.{Failure, Success, Try}
 
 /** Created by smanciot on 30/04/2020.
@@ -75,7 +76,7 @@ sealed trait ResourceBehavior
 
       case cmd: CreateResource =>
         import cmd._
-        val createdDate = now()
+        val createdDate = Instant.now()
         Effect
           .persist(
             ResourceCreatedEvent(
@@ -88,11 +89,11 @@ sealed trait ResourceBehavior
 
       case cmd: UpdateResource =>
         import cmd._
-        val lastUpdated = now()
+        val lastUpdated = Instant.now()
         val createdDate = {
           state match {
             case Some(resource) => resource.createdDate
-            case None           => now()
+            case None           => Instant.now()
           }
         }
         Effect
diff --git a/core/src/main/scala/app/softnetwork/resource/service/GenericResourceService.scala b/core/src/main/scala/app/softnetwork/resource/service/GenericResourceService.scala
@@ -22,6 +22,7 @@ import com.typesafe.scalalogging.StrictLogging
 import de.heikoseeberger.akkahttpjson4s.Json4sSupport
 import org.json4s.{jackson, Formats}
 import org.json4s.jackson.Serialization
+import org.slf4j.{Logger, LoggerFactory}
 
 /** Created by smanciot on 13/05/2020.
   */
@@ -188,5 +189,6 @@ object LocalFileSystemResourceService {
   def apply(aSystem: ActorSystem[_]): LocalFileSystemResourceService =
     new LocalFileSystemResourceService {
       override implicit def system: ActorSystem[_] = aSystem
+      lazy val log: Logger = LoggerFactory getLogger getClass.getName
     }
 }
diff --git a/project/src/main/scala/app/softnetwork/sbt/build/Versions.scala b/project/src/main/scala/app/softnetwork/sbt/build/Versions.scala
@@ -2,13 +2,13 @@ package app.softnetwork.sbt.build
 
 object Versions {
 
-  val genericPersistence = "0.2.6.2"
+  val genericPersistence = "0.3.0.2"
 
   val akkaPersistenceJdbc = "5.0.4"
 
-  val server = "0.2.9"
+  val server = "0.3.0.2"
 
-  val session = "0.1.4"
+  val session = "0.3.0.2"
 
   val scalatest = "3.1.1"
 }
diff --git a/testkit/src/main/scala/app/softnetwork/resource/scalatest/ResourceToLocalFileSystemTestKit.scala b/testkit/src/main/scala/app/softnetwork/resource/scalatest/ResourceToLocalFileSystemTestKit.scala
@@ -3,7 +3,7 @@ package app.softnetwork.resource.scalatest
 import akka.actor.typed.ActorSystem
 import app.softnetwork.persistence.launch.PersistentEntity
 import app.softnetwork.persistence.launch.PersistenceGuardian._
-import app.softnetwork.persistence.query.InMemoryJournalProvider
+import app.softnetwork.persistence.query.{InMemoryJournalProvider, InMemoryOffsetProvider}
 import app.softnetwork.resource.message.ResourceEvents.ResourceEvent
 import app.softnetwork.resource.message.ResourceMessages.{ResourceCommand, ResourceResult}
 import app.softnetwork.resource.model.Resource
@@ -13,6 +13,7 @@ import app.softnetwork.resource.persistence.query.{
 }
 import app.softnetwork.resource.persistence.typed.ResourceBehavior
 import org.scalatest.Suite
+import org.slf4j.{Logger, LoggerFactory}
 
 trait ResourceToLocalFileSystemTestKit extends GenericResourceTestKit[Resource] { _: Suite =>
 
@@ -22,10 +23,13 @@ trait ResourceToLocalFileSystemTestKit extends GenericResourceTestKit[Resource]
 
   override def resourceToExternalProcessorStream
     : ActorSystem[_] => GenericResourceToExternalProcessorStream[Resource] = sys =>
-    new ResourceToLocalFileSystemProcessorStream with InMemoryJournalProvider {
+    new ResourceToLocalFileSystemProcessorStream
+      with InMemoryJournalProvider
+      with InMemoryOffsetProvider {
       override val forTests = true
 
       override implicit def system: ActorSystem[_] = sys
+      lazy val log: Logger = LoggerFactory getLogger getClass.getName
     }
 
 }
diff --git a/testkit/src/test/scala/app/softnetwork/resource/handlers/ResourceHandlerSpec.scala b/testkit/src/test/scala/app/softnetwork/resource/handlers/ResourceHandlerSpec.scala
@@ -11,6 +11,7 @@ import app.softnetwork.resource.message.ResourceEvents._
 import app.softnetwork.resource.scalatest.ResourceToLocalFileSystemTestKit
 import app.softnetwork.resource.spi.{LocalFileSystemProvider, SizeOption}
 import app.softnetwork.resource.utils.ResourceTools
+import org.slf4j.{Logger, LoggerFactory}
 
 import java.nio.file.{Files, Paths}
 import scala.concurrent.Future
@@ -24,6 +25,8 @@ class ResourceHandlerSpec
     with AnyWordSpecLike
     with ResourceToLocalFileSystemTestKit {
 
+  lazy val log: Logger = LoggerFactory getLogger getClass.getName
+
   implicit lazy val system: ActorSystem[_] = typedSystem()
 
   var bytes: Array[Byte] = _
diff --git a/testkit/src/test/scala/app/softnetwork/resource/service/ResourceServiceSpec.scala b/testkit/src/test/scala/app/softnetwork/resource/service/ResourceServiceSpec.scala
@@ -2,13 +2,16 @@ package app.softnetwork.resource.service
 
 import app.softnetwork.resource.scalatest.ResourceToLocalFileSystemRouteTestKit
 import org.scalatest.wordspec.AnyWordSpecLike
+import org.slf4j.{Logger, LoggerFactory}
 
 import java.io.File
 import java.nio.file.{Path, Paths}
 import scala.reflect.io.Directory
 
 class ResourceServiceSpec extends AnyWordSpecLike with ResourceToLocalFileSystemRouteTestKit {
 
+  lazy val log: Logger = LoggerFactory getLogger getClass.getName
+
   val sessionId = "session"
 
   val resourceUuid = "resource"
