Move to play 3 / pekko

MAIF · Oct 4, 2024 · a900152 · a900152
1 parent a1e5cb3
commit a900152
Show file tree

Hide file tree

Showing 76 changed files with 432 additions and 409 deletions.
diff --git a/.sdkmanrc b/.sdkmanrc
@@ -0,0 +1,2 @@
+java=11-open
+sbt=1.10.2
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ import ReleaseTransformations._
 
 name := """nio"""
 organization := "fr.maif"
-scalaVersion := "2.13.10"
+scalaVersion := "2.13.11"
 
 lazy val root = (project in file("."))
   .aggregate(

diff --git a/nio-provider/app/actor/EventActor.scala b/nio-provider/app/actor/EventActor.scala
@@ -1,6 +1,6 @@
 package actor
 
-import akka.actor.{Actor, ActorRef, Props}
+import org.apache.pekko.actor.{Actor, ActorRef, Props}
 import models.NioEvent
 import play.api.libs.json.Json
 import utils.NioLogger

diff --git a/nio-provider/app/actor/KafkaActor.scala b/nio-provider/app/actor/KafkaActor.scala
@@ -1,9 +1,9 @@
 package actor
 
-import akka.NotUsed
-import akka.actor.{Actor, Props}
-import akka.stream.Materializer
-import akka.stream.scaladsl.Source
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.{Actor, Props}
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.Source
 import models.NioEvent
 import utils.NioLogger
 

diff --git a/nio-provider/app/controllers/HomeController.scala b/nio-provider/app/controllers/HomeController.scala
@@ -1,6 +1,6 @@
 package controllers
 
-import akka.actor.ActorSystem
+import org.apache.pekko.actor.ActorSystem
 import auth.AuthActionWithEmail
 import configuration.Env
 import messaging.KafkaMessageBroker

diff --git a/nio-provider/app/controllers/UserDataController.scala b/nio-provider/app/controllers/UserDataController.scala
@@ -3,10 +3,10 @@ package controllers
 import java.io.FileInputStream
 
 import actor.EventActor
-import akka.actor.ActorSystem
-import akka.stream.Materializer
-import akka.stream.scaladsl.{Source, StreamConverters}
-import akka.util.ByteString
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.{Source, StreamConverters}
+import org.apache.pekko.util.ByteString
 import auth.AuthActionWithEmail
 import configuration.Env
 import play.api.libs.streams.ActorFlow

diff --git a/nio-provider/app/filters/OtoroshiFilter.scala b/nio-provider/app/filters/OtoroshiFilter.scala
@@ -1,6 +1,6 @@
 package filters
 
-import akka.stream.Materializer
+import org.apache.pekko.stream.Materializer
 import auth.AuthInfo
 import com.auth0.jwt._
 import com.auth0.jwt.algorithms.Algorithm

diff --git a/nio-provider/app/loader/NioLoader.scala b/nio-provider/app/loader/NioLoader.scala
@@ -1,7 +1,7 @@
 package loader
 
 import actor.{EventActor, KafkaActor}
-import akka.actor.{ActorRef, ActorSystem}
+import org.apache.pekko.actor.{ActorRef, ActorSystem}
 import auth._
 import com.softwaremill.macwire.wire
 import configuration._

diff --git a/nio-provider/app/loader/Starter.scala b/nio-provider/app/loader/Starter.scala
@@ -1,7 +1,7 @@
 package loader
 
 import actor.KafkaActor
-import akka.actor.ActorSystem
+import org.apache.pekko.actor.ActorSystem
 import messaging.KafkaMessageBroker
 
 class Starter(kafkaMessageBroker: KafkaMessageBroker,

diff --git a/nio-provider/app/messaging/Kafka.scala b/nio-provider/app/messaging/Kafka.scala
@@ -2,7 +2,7 @@ package messaging
 
 import java.io.File
 
-import akka.actor.ActorSystem
+import org.apache.pekko.actor.ActorSystem
 import configuration.KafkaConfig
 import org.apache.kafka.clients.CommonClientConfigs
 import org.apache.kafka.common.config.internals.BrokerSecurityConfigs
@@ -13,7 +13,7 @@ import org.apache.kafka.common.serialization.{
 
 object KafkaSettings {
 
-  import akka.kafka.{ConsumerSettings, ProducerSettings}
+  import org.apache.pekko.kafka.{ConsumerSettings, ProducerSettings}
   import org.apache.kafka.clients.consumer.ConsumerConfig
   import org.apache.kafka.common.config.SslConfigs
   import org.apache.kafka.common.serialization.ByteArrayDeserializer

diff --git a/nio-provider/app/messaging/KafkaMessageBroker.scala b/nio-provider/app/messaging/KafkaMessageBroker.scala
@@ -1,11 +1,11 @@
 package messaging
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.kafka.Subscriptions
-import akka.kafka.scaladsl.Consumer
-import akka.stream.Materializer
-import akka.stream.scaladsl.{Flow, Sink, Source}
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.kafka.Subscriptions
+import org.apache.pekko.kafka.scaladsl.Consumer
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.{Flow, Sink, Source}
 import configuration.{Env, KafkaConfig}
 import models.NioEvent
 import utils.NioLogger

diff --git a/nio-provider/app/models/UserExtractTask.scala b/nio-provider/app/models/UserExtractTask.scala
@@ -1,6 +1,6 @@
 package models
 
-import org.joda.time.{DateTime, DateTimeZone}
+import java.time.{LocalDateTime, Clock}
 import play.api.libs.functional.syntax.{unlift, _}
 import play.api.libs.json.Reads._
 import play.api.libs.json.Writes._
@@ -15,16 +15,16 @@ case class UserExtractTask(
     orgKey: String,
     userId: String,
     email: String,
-    startedAt: DateTime,
-    uploadStartedAt: Option[DateTime],
-    endedAt: Option[DateTime]
+    startedAt: LocalDateTime,
+    uploadStartedAt: Option[LocalDateTime],
+    endedAt: Option[LocalDateTime]
 ) {
   def asJson(): JsValue =
     UserExtractTask.userExtractTaskWrites.writes(this)
 }
 
 object UserExtractTask {
-  implicit val dateFormats: Format[DateTime] = DateUtils.utcDateTimeFormats
+  implicit val dateFormats: Format[LocalDateTime] = DateUtils.utcDateTimeFormats
 
   implicit val userExtractTaskReads: Reads[UserExtractTask] = (
     (__ \ "_id").readNullable[String].map { maybeId =>
@@ -34,11 +34,11 @@ object UserExtractTask {
       (__ \ "orgKey").read[String] and
       (__ \ "userId").read[String] and
       (__ \ "email").read[String] and
-      (__ \ "startedAt").readNullable[DateTime].map { maybeStartedAt =>
-        maybeStartedAt.getOrElse(DateTime.now(DateTimeZone.UTC))
+      (__ \ "startedAt").readNullable[LocalDateTime].map { maybeStartedAt =>
+        maybeStartedAt.getOrElse(LocalDateTime.now(Clock.systemUTC))
       } and
-      (__ \ "uploadStartedAt").readNullable[DateTime] and
-      (__ \ "endedAt").readNullable[DateTime]
+      (__ \ "uploadStartedAt").readNullable[LocalDateTime] and
+      (__ \ "endedAt").readNullable[LocalDateTime]
   )(UserExtractTask.apply _)
 
   implicit val userExtractTaskWrites: Writes[UserExtractTask] = (
@@ -47,9 +47,9 @@ object UserExtractTask {
       (JsPath \ "orgKey").write[String] and
       (JsPath \ "userId").write[String] and
       (JsPath \ "email").write[String] and
-      (JsPath \ "startedAt").write[DateTime] and
-      (JsPath \ "uploadStartedAt").writeNullable[DateTime] and
-      (JsPath \ "endedAt").writeNullable[DateTime]
+      (JsPath \ "startedAt").write[LocalDateTime] and
+      (JsPath \ "uploadStartedAt").writeNullable[LocalDateTime] and
+      (JsPath \ "endedAt").writeNullable[LocalDateTime]
   )(unlift(UserExtractTask.unapply))
 
   implicit val userExtractTaskOWrites: OWrites[UserExtractTask] = (
@@ -58,9 +58,9 @@ object UserExtractTask {
       (JsPath \ "orgKey").write[String] and
       (JsPath \ "userId").write[String] and
       (JsPath \ "email").write[String] and
-      (JsPath \ "startedAt").write[DateTime] and
-      (JsPath \ "uploadStartedAt").writeNullable[DateTime] and
-      (JsPath \ "endedAt").writeNullable[DateTime]
+      (JsPath \ "startedAt").write[LocalDateTime] and
+      (JsPath \ "uploadStartedAt").writeNullable[LocalDateTime] and
+      (JsPath \ "endedAt").writeNullable[LocalDateTime]
   )(unlift(UserExtractTask.unapply))
 
   implicit val format: Format[UserExtractTask]   =

diff --git a/nio-provider/app/models/events.scala b/nio-provider/app/models/events.scala
@@ -1,6 +1,6 @@
 package models
 
-import org.joda.time.{DateTime, DateTimeZone}
+import java.time.{LocalDateTime, Clock}
 import utils.NioLogger
 import play.api.libs.json._
 import utils.DateUtils
@@ -47,7 +47,7 @@ object NioEvent {
 
 trait NioEvent {
   val id: Long
-  val date: DateTime
+  val date: LocalDateTime
   val tenant: String
 
   def tYpe: EventType.Value
@@ -70,7 +70,7 @@ case class UserExtractTaskAsked(
     author: String,
     metadata: Option[Seq[(String, String)]] = None,
     id: Long,
-    date: DateTime = DateTime.now(DateTimeZone.UTC),
+    date: LocalDateTime = LocalDateTime.now(Clock.systemUTC),
     payload: UserExtractTask
 ) extends NioEvent {
   override def tYpe: EventType.Value = EventType.UserExtractTaskAsked
@@ -82,7 +82,7 @@ case class UserExtractTaskAsked(
         "tenant"   -> tenant,
         "author"   -> author,
         "metadata" -> buildMetadata(metadata),
-        "date"     -> date.toString(DateUtils.utcDateFormatter),
+        "date"     -> date.format(DateUtils.utcDateFormatter),
         "id"       -> id,
         "payload"  -> payload.asJson()
       )
@@ -94,7 +94,7 @@ case class UserExtractTaskCompleted(
     author: String,
     metadata: Option[Seq[(String, String)]] = None,
     id: Long,
-    date: DateTime = DateTime.now(DateTimeZone.UTC),
+    date: LocalDateTime = LocalDateTime.now(Clock.systemUTC),
     payload: UserExtractTask
 ) extends NioEvent {
   override def tYpe: EventType.Value = EventType.UserExtractTaskCompleted
@@ -106,7 +106,7 @@ case class UserExtractTaskCompleted(
         "tenant"   -> tenant,
         "author"   -> author,
         "metadata" -> buildMetadata(metadata),
-        "date"     -> date.toString(DateUtils.utcDateFormatter),
+        "date"     -> date.format(DateUtils.utcDateFormatter),
         "id"       -> id,
         "payload"  -> payload.asJson()
       )

diff --git a/nio-provider/app/service/NioService.scala b/nio-provider/app/service/NioService.scala
@@ -1,8 +1,8 @@
 package service
 
-import akka.http.scaladsl.model.HttpMethods
-import akka.stream.scaladsl.Source
-import akka.util.ByteString
+import org.apache.pekko.http.scaladsl.model.HttpMethods
+import org.apache.pekko.stream.scaladsl.Source
+import org.apache.pekko.util.ByteString
 import configuration.{Env, NioConfig}
 import play.api.libs.json.JsValue
 import play.api.libs.ws.WSClient

diff --git a/nio-provider/app/utils/DateUtils.scala b/nio-provider/app/utils/DateUtils.scala
@@ -1,30 +1,31 @@
 package utils
 
-import org.joda.time.DateTime
+import java.time.LocalDateTime
 import org.joda.time.format.DateTimeFormat
 import play.api.libs.json._
 
+import java.time.format.DateTimeFormatter
 import scala.util.{Failure, Success, Try}
 
 object DateUtils {
-  val utcDateFormatter = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")
+  val utcDateFormatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME //forPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")
 
-  val utcDateTimeReads = new Reads[DateTime] {
+  val utcDateTimeReads = new Reads[LocalDateTime] {
     def reads(json: JsValue) = json match {
       case JsString(s) =>
-        Try(DateTime.parse(s, utcDateFormatter)) match {
+        Try(LocalDateTime.parse(s, utcDateFormatter)) match {
           case Success(d) => JsSuccess(d)
           case Failure(f) => JsSuccess(null)
         }
       case _ => JsError("error.expected.date")
     }
   }
 
-  val utcDateTimeWrites = new Writes[DateTime] {
-    override def writes(o: DateTime): JsValue =
-      JsString(o.toString(DateUtils.utcDateFormatter))
+  val utcDateTimeWrites = new Writes[LocalDateTime] {
+    override def writes(o: LocalDateTime): JsValue =
+      JsString(o.format(DateUtils.utcDateFormatter))
   }
 
-  val utcDateTimeFormats: Format[DateTime] =
+  val utcDateTimeFormats: Format[LocalDateTime] =
     Format(utcDateTimeReads, utcDateTimeWrites)
 }
diff --git a/nio-provider/build.sbt b/nio-provider/build.sbt
@@ -9,17 +9,21 @@ lazy val `nio-provider` = (project in file("."))
   .enablePlugins(NoPublish)
   .disablePlugins(BintrayPlugin)
 
-scalaVersion := "2.13.10"
+scalaVersion := "2.13.14"
 
 resolvers ++= Seq(
   Resolver.jcenterRepo,
   "Maven central" at "https://repo1.maven.org/maven2/"
 )
 
+dependencyOverrides ++= Seq(
+  "com.github.luben"          % "zstd-jni"                 % "1.5.6-4"
+)
+
 libraryDependencies ++= Seq(
   ws,
   "com.typesafe.play"        %% "play-json-joda"     % playJsonJodaVersion,
-  "com.typesafe.akka"        %% "akka-stream-kafka"  % akkaStreamKafka,
+  "org.apache.pekko"         %% "pekko-connectors-kafka"        % pekkoKafka,
   "de.svenkubiak"             % "jBCrypt"            % "0.4.1", //  ISC/BSD
   "com.auth0"                 % "java-jwt"           % javaJwt, // MIT license
   "com.github.pureconfig"    %% "pureconfig"         % pureConfig, // Apache 2.0

diff --git a/nio-server/app/auth/auth.scala b/nio-server/app/auth/auth.scala
@@ -1,6 +1,6 @@
 package auth
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import configuration.Env
 import db.ExtractionTaskMongoDataStore
 import utils.NioLogger

diff --git a/nio-server/app/controllers/ApiKeyController.scala b/nio-server/app/controllers/ApiKeyController.scala
@@ -1,6 +1,6 @@
 package controllers
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import auth.SecuredAuthContext
 import controllers.ErrorManager.{AppErrorManagerResult, ErrorManagerResult}
 import db.ApiKeyMongoDataStore

diff --git a/nio-server/app/controllers/Auth0Controller.scala b/nio-server/app/controllers/Auth0Controller.scala
@@ -4,7 +4,7 @@ import java.math.BigInteger
 import java.security.SecureRandom
 import java.util.UUID.randomUUID
 
-import akka.http.scaladsl.util.FastFuture
+import org.apache.pekko.http.scaladsl.util.FastFuture
 import configuration.{Auth0Config, Env}
 import controllers.ErrorManager.AppErrorManagerResult
 import org.apache.commons.lang3.StringUtils

diff --git a/nio-server/app/controllers/ConsentController.scala b/nio-server/app/controllers/ConsentController.scala
@@ -1,11 +1,11 @@
 package controllers
 
-import akka.NotUsed
-import akka.actor.ActorSystem
-import akka.http.scaladsl.util.FastFuture
-import akka.stream.{FlowShape, Materializer}
-import akka.stream.scaladsl.{Flow, Framing, GraphDSL, Merge, Partition, Sink, Source}
-import akka.util.ByteString
+import org.apache.pekko.NotUsed
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.http.scaladsl.util.FastFuture
+import org.apache.pekko.stream.{FlowShape, Materializer}
+import org.apache.pekko.stream.scaladsl.{Flow, Framing, GraphDSL, Merge, Partition, Sink, Source}
+import org.apache.pekko.util.ByteString
 import auth.{AuthAction, SecuredAuthContext}
 import controllers.ErrorManager.{AppErrorManagerResult, ErrorManagerResult, ErrorWithStatusManagerResult}
 import db.{ConsentFactMongoDataStore, LastConsentFactMongoDataStore, OrganisationMongoDataStore, UserMongoDataStore}
@@ -449,7 +449,7 @@ class ConsentController(
 
   def downloadBulked(tenant: String) = AuthAction { implicit req =>
     NioLogger.info(s"Downloading consents (using bulked reads) from tenant $tenant")
-    import reactivemongo.akkastream.cursorProducer
+    import reactivemongo.pekkostream.cursorProducer
 
     val src = Source
       .futureSource {

diff --git a/nio-server/app/controllers/DeletionController.scala b/nio-server/app/controllers/DeletionController.scala
@@ -1,6 +1,6 @@
 package controllers
 
-import akka.actor.ActorSystem
+import org.apache.pekko.actor.ActorSystem
 import auth.{AuthAction, SecuredAction, SecuredAuthContext}
 import db.{ConsentFactMongoDataStore, DeletionTaskMongoDataStore, OrganisationMongoDataStore, UserMongoDataStore}
 import messaging.KafkaMessageBroker

diff --git a/nio-server/app/controllers/ExtractionController.scala b/nio-server/app/controllers/ExtractionController.scala
@@ -3,10 +3,10 @@ package controllers
 import java.io.ByteArrayInputStream
 import java.util
 
-import akka.actor.ActorSystem
-import akka.stream.Materializer
-import akka.stream.scaladsl.{Flow, Source}
-import akka.util.ByteString
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.Materializer
+import org.apache.pekko.stream.scaladsl.{Flow, Source}
+import org.apache.pekko.util.ByteString
 import auth._
 import com.amazonaws.services.s3.model.{
   CompleteMultipartUploadRequest,