WIP

build.sbt

@@ -1,8 +1,9 @@
-import ReleaseTransformations._
+import Dependencies._scalaVersion
+import ReleaseTransformations.*
 
 name := """nio"""
 organization := "fr.maif"
-scalaVersion := "2.13.11"
+scalaVersion := _scalaVersion
 
 lazy val root = (project in file("."))
   .aggregate(
@@ -15,7 +16,7 @@ lazy val `nio-provider` = project
 
 inThisBuild(
    List(
-     scalaVersion := "2.13.14",
+     scalaVersion := _scalaVersion,
      semanticdbEnabled := true,
      semanticdbVersion := scalafixSemanticdb.revision
   )

manual/build.sbt

@@ -1,7 +1,7 @@
 name := """nio-manual"""
 organization := "fr.maif"
 version := "2.0.4"
-scalaVersion := "2.12.4"
+scalaVersion := _scalaVersion
 
 lazy val docs = (project in file("."))
   .enablePlugins(ParadoxPlugin)

nio-provider/app/actor/EventActor.scala

@@ -11,7 +11,7 @@ object EventActor {
 
 class EventActor(out: ActorRef) extends Actor {
 
-  override def preStart: Unit = context.system.eventStream.subscribe(self, classOf[NioEvent])
+  override def preStart(): Unit = context.system.eventStream.subscribe(self, classOf[NioEvent])
 
   override def receive: Receive = { case e: NioEvent =>
     NioLogger.info(s"Event actor received a message : ${e.tYpe}")

nio-provider/build.sbt

@@ -9,7 +9,7 @@ lazy val `nio-provider` = (project in file("."))
   .enablePlugins(NoPublish)
   .disablePlugins(BintrayPlugin)
 
-scalaVersion := "2.13.14"
+scalaVersion := _scalaVersion
 
 resolvers ++= Seq(
   Resolver.jcenterRepo,

nio-server/app/db/LastConsentFactMongoDataStore.scala

@@ -15,10 +15,12 @@ import reactivemongo.api.indexes.{Index, IndexType}
 import utils.BSONUtils
 import utils.Result.{AppErrors, ErrorMessage}
 
+import scala.annotation.nowarn
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.Failure
-import scala.collection.{immutable, Seq}
+import scala.collection.{Seq, immutable}
 
+@nowarn("msg=Will be removed when provided by Play-JSON itself")
 class LastConsentFactMongoDataStore(val mongoApi: ReactiveMongoApi)(implicit val executionContext: ExecutionContext)
     extends MongoDataStore[ConsentFact] {
 

nio-server/app/db/MongoOpsDataStore.scala

@@ -5,9 +5,11 @@ import org.apache.pekko.stream.scaladsl.Source
 import reactivemongo.api.{Cursor, ReadPreference}
 import reactivemongo.api.bson.collection.BSONCollection
 
+import scala.annotation.nowarn
 import scala.concurrent.{ExecutionContext, Future}
 import scala.collection.Seq
 
+@nowarn("msg=Will be removed when provided by Play-JSON itself")
 object MongoOpsDataStore {
 
   implicit class MongoDataStore(coll: BSONCollection)(implicit executionContext: ExecutionContext) {

nio-server/app/db/OrganisationMongoDataStore.scala

@@ -12,9 +12,11 @@ import reactivemongo.api.indexes.Index.Default
 import reactivemongo.api.indexes.{Index, IndexType}
 import utils.Result.{AppErrors, ErrorMessage}
 
+import scala.annotation.nowarn
 import scala.concurrent.{ExecutionContext, Future}
 import scala.collection.{Seq, immutable}
 
+@nowarn("msg=Will be removed when provided by Play-JSON itself")
 class OrganisationMongoDataStore(val mongoApi: ReactiveMongoApi)(implicit val executionContext: ExecutionContext)
     extends MongoDataStore[Organisation] {
 

nio-server/app/db/UserMongoDataStore.scala

@@ -5,10 +5,11 @@ import org.apache.pekko.stream.scaladsl.Source
 import models._
 import play.api.libs.json.{JsValue, Json, OFormat}
 import play.modules.reactivemongo.ReactiveMongoApi
+import reactivemongo.api.indexes.Index.Default
 import reactivemongo.api.indexes.{Index, IndexType}
 
 import scala.concurrent.{ExecutionContext, Future}
-import scala.collection.{immutable, Seq}
+import scala.collection.{Seq, immutable}
 
 class UserMongoDataStore(val mongoApi: ReactiveMongoApi)(implicit val executionContext: ExecutionContext)
     extends MongoDataStore[User] {
@@ -23,7 +24,7 @@ class UserMongoDataStore(val mongoApi: ReactiveMongoApi)(implicit val executionC
 
   override def collectionName(tenant: String) = s"$tenant-users"
 
-  override def indices = Seq(
+  override def indices: Seq[Default] = Seq(
     Index(
       key = immutable.Seq("orgKey" -> IndexType.Ascending, "userId" -> IndexType.Ascending),
       name = Some("orgKey_userId"),
@@ -78,27 +79,6 @@ class UserMongoDataStore(val mongoApi: ReactiveMongoApi)(implicit val executionC
         .documentSource()
     }
 
-  def streamAllConsentFactIds(tenant: String)(implicit m: Materializer): Future[Source[JsValue, Future[State]]] =
-    storedCollection(tenant).map { col =>
-      col
-        .find(
-          Json.obj(),
-          Some(Json.obj("_id" -> 0, "latestConsentFactId" -> 1))
-        )
-        .cursor[JsValue]()
-        .documentSource()
-    }
-
-  def streamAllUsersConsentFacts(tenant: String)(implicit m: Materializer): Future[Source[JsValue, Future[State]]] =
-    storedCollection(tenant).map { users =>
-      users
-        .aggregateWith[JsValue]() { framework =>
-          import framework.Lookup
-          List(Lookup(s"$tenant-consentFacts", "latestConsentFactId", "_id", "consentFact"))
-        }
-        .documentSource()
-    }
-
   def deleteUserByTenant(tenant: String): Future[Boolean] =
     storedCollection(tenant).flatMap { col =>
       col.drop(failIfNotFound = false)

nio-server/app/models/ApiKey.scala

@@ -134,7 +134,7 @@ object ApiKey extends ReadableEntity[ApiKey] {
   def fromXml(xml: Elem): Either[AppErrors, ApiKey] =
     readXml.read(xml, Some("ApiKey")).toEither
 
-  def fromJson(json: JsValue) =
+  def fromJson(json: JsValue): Either[AppErrors, ApiKey] =
     json.validate[ApiKey] match {
       case JsSuccess(o, _) => Right(o)
       case JsError(errors) => Left(AppErrors.fromJsError(errors))
@@ -143,7 +143,7 @@ object ApiKey extends ReadableEntity[ApiKey] {
 }
 
 case class ApiKeys(page: Int, pageSize: Int, count: Long, items: Seq[ApiKey]) extends ModelTransformAs {
-  def asJson() =
+  def asJson(): JsObject =
     Json.obj("page" -> page, "pageSize" -> pageSize, "count" -> count, "items" -> JsArray(items.map(_.asJson())))
 
   def asXml()  = <apiKeys>

nio-server/app/models/NioAccount.scala

@@ -160,10 +160,10 @@ object NioAccount extends ReadableEntity[NioAccount] {
 }
 
 case class NioAccounts(page: Int, pageSize: Int, count: Long, items: Seq[NioAccount]) extends ModelTransformAs {
-  def asJson() =
+  def asJson(): JsObject =
     Json.obj("page" -> page, "pageSize" -> pageSize, "count" -> count, "items" -> JsArray(items.map(_.asJson())))
 
-  def asXml()  = <nioAccounts>
+  def asXml(): Elem = <nioAccounts>
     <page>
       {page}
     </page>

nio-server/app/models/PagedConsentFacts.scala

@@ -1,14 +1,16 @@
 package models
 
-import play.api.libs.json.{JsArray, Json}
+import play.api.libs.json.{JsArray, JsObject, Json}
+
 import scala.collection.Seq
+import scala.xml.Elem
 
 case class PagedConsentFacts(page: Int, pageSize: Int, count: Long, items: Seq[ConsentFact]) extends ModelTransformAs {
 
-  def asJson() =
+  def asJson(): JsObject =
     Json.obj("page" -> page, "pageSize" -> pageSize, "count" -> count, "items" -> JsArray(items.map(_.asJson())))
 
-  def asXml()  = <pagedConsentFacts>
+  def asXml(): Elem = <pagedConsentFacts>
       <page>{page}</page>
       <pageSize>{pageSize}</pageSize>
       <count>{count}</count>

nio-server/app/models/PagedUsers.scala

@@ -1,20 +1,22 @@
 package models
 
-import play.api.libs.json.{JsArray, Json}
+import play.api.libs.json.{JsArray, JsObject, Json}
 import libs.xml.XmlUtil.XmlCleaner
+
 import scala.collection.Seq
+import scala.xml.Elem
 
 case class PagedUsers(page: Int, pageSize: Int, count: Long, items: Seq[User]) extends ModelTransformAs {
 
-  def asJson() =
+  def asJson(): JsObject =
     Json.obj(
       "page"     -> page,
       "pageSize" -> pageSize,
       "count"    -> count,
       "items"    -> JsArray(items.map(u => Json.obj("userId" -> u.userId, "orgKey" -> u.orgKey)))
     )
 
-  def asXml() = <pagedUsers>
+  def asXml(): Elem = <pagedUsers>
       <page>{page}</page>
       <pageSize>{pageSize}</pageSize>
       <count>{count}</count>

nio-server/app/models/Permission.scala

@@ -91,7 +91,7 @@ object Permission {
 
   implicit val readXmlFiniteDuration: XMLRead[FiniteDuration] = (xml: NodeSeq, path: Option[String]) =>
     Try(xml.head.text)
-      .map { str: String =>
+      .map { (str: String) =>
         Try (Duration(str)) match {
           case Success(value: FiniteDuration) => value.valid
           case Success(_) => AppErrors.error("invalid duration").invalid

nio-server/build.sbt

@@ -9,7 +9,7 @@ lazy val `nio-server` = (project in file("."))
   .enablePlugins(NoPublish)
   .disablePlugins(BintrayPlugin)
 
-scalaVersion := "2.13.14"
+scalaVersion := Dependencies._scalaVersion
 
 resolvers ++= Seq(
   Resolver.jcenterRepo,
@@ -60,7 +60,7 @@ scalacOptions ++= Seq(
   "-language:higherKinds",
   "-language:implicitConversions",
   "-language:existentials",
-  "-Wunused"
+  "-Wunused:imports" //, "-Xsource:3"
 )
 
 /// ASSEMBLY CONFIG

project/Dependencies.scala

@@ -1,4 +1,7 @@
 object Dependencies {
+
+  val _scalaVersion = "2.13.15"
+
   val reactiveMongoVersion = "1.1.0"
   val pekko                = "1.1.1"
   val pekkoKafka           = "1.1.0"