Mise à jour vers Scala 3

betagouv · Sep 4, 2024 · bc024ad · bc024ad
1 parent a5d625b
commit bc024ad
Show file tree

Hide file tree

Showing 38 changed files with 190 additions and 156 deletions.
diff --git a/.scalafix.conf b/.scalafix.conf
@@ -12,4 +12,6 @@ OrganizeImports {
     "*"
   ]
   importsOrder = SymbolsFirst
+  # TODO: "OrganizeImports.removeUnused"is not supported on 3.3.3 as the compiler is not providing enough information. Please upgrade the Scala compiler to 3.4.0 or greater. Otherwise, run the rule with "OrganizeImports.removeUnused" set to false to organize imports while keeping potentially unused imports.
+  removeUnused = false
 }
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,5 +1,5 @@
 version = "3.8.3"
-runner.dialect = scala213source3
+runner.dialect = scala3
 maxColumn = 100
 spaces.afterKeywordBeforeParen = true
 newlines.topLevelStatements = [before, after]

diff --git a/app/controllers/ApiController.scala b/app/controllers/ApiController.scala
@@ -9,7 +9,7 @@ import java.util.UUID
 import javax.inject.{Inject, Singleton}
 import models.{Area, Authorization, Error, EventType, Organisation, User, UserGroup}
 import play.api.libs.json.{JsValue, Json}
-import play.api.mvc._
+import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents, Result}
 import scala.concurrent.{ExecutionContext, Future}
 import serializers.ApiModel._
 import serializers.Keys
@@ -24,13 +24,14 @@ import services.{
 @Singleton
 case class ApiController @Inject() (
     anonymizedDataService: AnonymizedDataService,
+    val controllerComponents: ControllerComponents,
     loginAction: LoginAction,
     eventService: EventService,
     organisationService: OrganisationService,
     userService: UserService,
     userGroupService: UserGroupService
 )(implicit val ec: ExecutionContext)
-    extends InjectedController
+    extends BaseController
     with UserOperators {
   import OrganisationService.FranceServiceInstance
 

diff --git a/app/controllers/ApplicationController.scala b/app/controllers/ApplicationController.scala
@@ -44,7 +44,16 @@ import play.api.data._
 import play.api.i18n.I18nSupport
 import play.api.libs.json.Json
 import play.api.libs.ws.WSClient
-import play.api.mvc.{Action, AnyContent, Call, InjectedController, RequestHeader, Result, Session}
+import play.api.mvc.{
+  Action,
+  AnyContent,
+  BaseController,
+  Call,
+  ControllerComponents,
+  RequestHeader,
+  Result,
+  Session
+}
 import play.twirl.api.Html
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.{Failure, Success, Try}
@@ -78,6 +87,7 @@ case class ApplicationController @Inject() (
     applicationService: ApplicationService,
     businessDaysService: BusinessDaysService,
     config: AppConfig,
+    val controllerComponents: ControllerComponents,
     dependencies: ServicesDependencies,
     eventService: EventService,
     fileService: FileService,
@@ -89,7 +99,7 @@ case class ApplicationController @Inject() (
     userService: UserService,
     ws: WSClient,
 )(implicit ec: ExecutionContext, webJarsUtil: WebJarsUtil)
-    extends InjectedController
+    extends BaseController
     with I18nSupport
     with Operators.Common
     with Operators.ApplicationOperators
@@ -621,7 +631,8 @@ case class ApplicationController @Inject() (
               views.applications.myApplicationsLegacy
                 .page(user, userRights, filteredByStatus.map(_.application), userGroups, infos)
             )
-        ).withHeaders(CACHE_CONTROL -> "no-store")
+        )
+        .withHeaders(CACHE_CONTROL -> "no-store")
     }
 
   private def applicationBoardInfos(
@@ -1130,7 +1141,8 @@ case class ApplicationController @Inject() (
          }
        }
        coworkers.combine(instructorsCoworkers)
-     }).map(
+     })
+    .map(
       _.filterNot(user =>
         user.id === request.currentUser.id || application.invitedUsers.contains(user.id)
       )

diff --git a/app/controllers/AreaController.scala b/app/controllers/AreaController.scala
@@ -7,19 +7,20 @@ import models._
 import models.EventType.{AllAreaUnauthorized, DeploymentDashboardUnauthorized}
 import modules.AppConfig
 import org.webjars.play.WebJarsUtil
-import play.api.mvc.{Action, AnyContent, InjectedController}
+import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
 import scala.concurrent.{ExecutionContext, Future}
 import services.{EventService, UserGroupService, UserService}
 
 @Singleton
 case class AreaController @Inject() (
     config: AppConfig,
+    val controllerComponents: ControllerComponents,
     loginAction: LoginAction,
     eventService: EventService,
     userService: UserService,
     userGroupService: UserGroupService,
 )(implicit ec: ExecutionContext, val webJarsUtil: WebJarsUtil)
-    extends InjectedController
+    extends BaseController
     with Operators.Common
     with UserOperators {
 

diff --git a/app/controllers/CSVImportController.scala b/app/controllers/CSVImportController.scala
@@ -3,6 +3,7 @@ package controllers
 import actions.LoginAction
 import cats.syntax.all._
 import controllers.Operators.{GroupOperators, UserOperators}
+import helper.MiscHelpers.toTupleOpt
 import helper.PlayFormHelpers.{inOption, normalizedOptionalText, normalizedText}
 import helper.StringHelper._
 import helper.Time
@@ -33,22 +34,24 @@ import org.webjars.play.WebJarsUtil
 import play.api.data.{Form, Mapping}
 import play.api.data.Forms._
 import play.api.data.validation.Constraints.{maxLength, nonEmpty}
-import play.api.mvc.{Action, AnyContent, InjectedController}
+import play.api.i18n.I18nSupport
+import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
 import scala.concurrent.{ExecutionContext, Future}
 import serializers.UserAndGroupCsvSerializer
 import serializers.UserAndGroupCsvSerializer.UserGroupBlock
 import services.{EventService, NotificationService, UserGroupService, UserService}
 
 case class CSVImportController @Inject() (
     config: AppConfig,
+    val controllerComponents: ControllerComponents,
     loginAction: LoginAction,
     userService: UserService,
     groupService: UserGroupService,
     notificationsService: NotificationService,
     eventService: EventService
 )(implicit ec: ExecutionContext, webJarsUtil: WebJarsUtil)
-    extends InjectedController
-    with play.api.i18n.I18nSupport
+    extends BaseController
+    with I18nSupport
     with Operators.Common
     with UserOperators
     with GroupOperators {
@@ -171,7 +174,7 @@ case class CSVImportController @Inject() (
       "instructor" -> boolean,
       "groupAdmin" -> boolean,
       "phoneNumber" -> normalizedOptionalText
-    )(CSVReviewUserFormData.apply)(CSVReviewUserFormData.unapply)
+    )(CSVReviewUserFormData.apply)(toTupleOpt)
 
   private def groupImportMapping(date: ZonedDateTime): Mapping[UserGroup] =
     mapping(
@@ -195,7 +198,7 @@ case class CSVImportController @Inject() (
       "email" -> optional(email),
       "publicNote" -> ignored(Option.empty[String]),
       "internalSupportComment" -> ignored(Option.empty[String])
-    )(UserGroup.apply)(UserGroup.unapply)
+    )(UserGroup.apply)(toTupleOpt)
 
   private def importUsersAfterReviewForm(date: ZonedDateTime): Form[List[CSVUserGroupFormData]] =
     Form(
@@ -210,12 +213,12 @@ case class CSVImportController @Inject() (
                 "alreadyExists" -> boolean,
                 "alreadyExistingUser" -> ignored(Option.empty[User]),
                 "isInMoreThanOneGroup" -> optional(boolean)
-              )(CSVUserFormData.apply)(CSVUserFormData.unapply)
+              )(CSVUserFormData.apply)(toTupleOpt)
             ),
             "alreadyExistsOrAllUsersAlreadyExist" -> boolean,
             "doNotInsert" -> boolean,
             "alreadyExistingGroup" -> ignored(Option.empty[UserGroup])
-          )(CSVUserGroupFormData.apply)(CSVUserGroupFormData.unapply)
+          )(CSVUserGroupFormData.apply)(toTupleOpt)
         )
       )
     )
@@ -438,7 +441,7 @@ case class CSVImportController @Inject() (
                         },
                         { _ =>
                           usersToInsert.foreach { user =>
-                            notificationsService.newUser(user)
+                            val _ = notificationsService.newUser(user)
                             eventService.log(
                               UserCreated,
                               "Utilisateur ajouté",

diff --git a/app/controllers/GroupController.scala b/app/controllers/GroupController.scala
@@ -28,7 +28,15 @@ import modules.AppConfig
 import org.webjars.play.WebJarsUtil
 import play.api.data.Form
 import play.api.i18n.I18nSupport
-import play.api.mvc.{Action, AnyContent, Call, InjectedController, RequestHeader, Result}
+import play.api.mvc.{
+  Action,
+  AnyContent,
+  BaseController,
+  Call,
+  ControllerComponents,
+  RequestHeader,
+  Result
+}
 import play.libs.ws.WSClient
 import scala.concurrent.{ExecutionContext, Future}
 import serializers.Keys
@@ -39,14 +47,15 @@ import views.editMyGroups.UserInfos
 case class GroupController @Inject() (
     applicationService: ApplicationService,
     config: AppConfig,
+    val controllerComponents: ControllerComponents,
     dependencies: ServicesDependencies,
     eventService: EventService,
     groupService: UserGroupService,
     loginAction: LoginAction,
     userService: UserService,
     ws: WSClient,
 )(implicit ec: ExecutionContext, webJarsUtil: WebJarsUtil)
-    extends InjectedController
+    extends BaseController
     with I18nSupport
     with Operators.Common
     with GroupOperators
@@ -253,7 +262,7 @@ case class GroupController @Inject() (
             )
             Future(Unauthorized("Le groupe est utilisé."))
           } else {
-            groupService.deleteById(groupId)
+            val _ = groupService.deleteById(groupId)
             eventService.log(
               UserGroupDeleted,
               "Groupe supprimé",

diff --git a/app/controllers/HomeController.scala b/app/controllers/HomeController.scala
@@ -8,7 +8,7 @@ import org.webjars.play.WebJarsUtil
 import play.api.Logger
 import play.api.db.Database
 import play.api.i18n.I18nSupport
-import play.api.mvc._
+import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
 import serializers.Keys
 import views.home.LoginPanel
 
@@ -17,10 +17,11 @@ import views.home.LoginPanel
 @Singleton
 class HomeController @Inject() (
     val config: AppConfig,
+    val controllerComponents: ControllerComponents,
     loginAction: LoginAction,
     db: Database,
 )(implicit webJarsUtil: WebJarsUtil)
-    extends InjectedController
+    extends BaseController
     with I18nSupport
     with Operators.Common {
 

diff --git a/app/controllers/JavascriptController.scala b/app/controllers/JavascriptController.scala
@@ -1,12 +1,13 @@
 package controllers
 
-import javax.inject.Singleton
+import javax.inject.{Inject, Singleton}
 import play.api.http.MimeTypes
-import play.api.mvc.{Action, AnyContent, InjectedController}
+import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
 import play.api.routing.JavaScriptReverseRouter
 
 @Singleton
-class JavascriptController() extends InjectedController {
+class JavascriptController @Inject() (val controllerComponents: ControllerComponents)
+    extends BaseController {
 
   def javascriptRoutes: Action[AnyContent] =
     Action { implicit request =>

diff --git a/app/controllers/LoginController.scala b/app/controllers/LoginController.scala
@@ -10,7 +10,7 @@ import models.{Authorization, EventType, LoginToken, User}
 import models.EventType.{GenerateToken, UnknownEmail}
 import modules.AppConfig
 import org.webjars.play.WebJarsUtil
-import play.api.mvc.{Action, AnyContent, InjectedController, Request}
+import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents, Request}
 import scala.concurrent.{ExecutionContext, Future}
 import serializers.Keys
 import services.{
@@ -26,14 +26,15 @@ import views.home.LoginPanel
 @Singleton
 class LoginController @Inject() (
     val config: AppConfig,
+    val controllerComponents: ControllerComponents,
     dependencies: ServicesDependencies,
     userService: UserService,
     notificationService: NotificationService,
     tokenService: TokenService,
     eventService: EventService,
     signupService: SignupService
 )(implicit ec: ExecutionContext, webJarsUtil: WebJarsUtil)
-    extends InjectedController
+    extends BaseController
     with Operators.Common {
 
   import dependencies.ioRuntime
@@ -129,7 +130,7 @@ class LoginController @Inject() (
   )(implicit request: Request[AnyContent]) = {
     // Note: we have a small race condition here
     //       this should be OK almost always
-    tokenService.create(token)
+    val _ = tokenService.create(token)
     // Here we want to redirect some users to more useful pages:
     // observer => /stats
     val path: String = {

diff --git a/app/controllers/MandatController.scala b/app/controllers/MandatController.scala
@@ -12,7 +12,7 @@ import models.jsonApiModels.mandat._
 import modules.AppConfig
 import org.webjars.play.WebJarsUtil
 import play.api.libs.json.{JsError, JsString, JsValue, Json}
-import play.api.mvc.{Action, AnyContent, InjectedController, PlayBodyParsers}
+import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents, PlayBodyParsers}
 import scala.concurrent.{ExecutionContext, Future}
 import services.{
   EventService,
@@ -28,6 +28,7 @@ import services.{
 case class MandatController @Inject() (
     bodyParsers: PlayBodyParsers,
     config: AppConfig,
+    val controllerComponents: ControllerComponents,
     eventService: EventService,
     loginAction: LoginAction,
     mandatService: MandatService,
@@ -37,7 +38,7 @@ case class MandatController @Inject() (
     userGroupService: UserGroupService,
     userService: UserService
 )(implicit val ec: ExecutionContext, webJarsUtil: WebJarsUtil)
-    extends InjectedController
+    extends BaseController
     with Operators.Common
     with UserOperators {
 
@@ -68,7 +69,7 @@ case class MandatController @Inject() (
                     EventType.MandatGenerated,
                     s"Le mandat ${mandat.id.underlying} (version ${mandat.version}) a été créé."
                   )
-                  notificationsService.mandatV2Generated(mandat.id, request.currentUser)
+                  val _ = notificationsService.mandatV2Generated(mandat.id, request.currentUser)
                   Ok(Json.toJson(mandat))
                 }
               )
@@ -132,7 +133,7 @@ case class MandatController @Inject() (
                     s"Le mandat par SMS ${mandat.id.underlying} a été créé. " +
                       s"Le SMS de demande ${sms.apiId.underlying} a été envoyé"
                   )
-                  notificationsService.mandatSmsSent(mandat.id, request.currentUser)
+                  val _ = notificationsService.mandatSmsSent(mandat.id, request.currentUser)
                   Ok(Json.toJson(mandat))
                 }
               )

diff --git a/app/controllers/SignupController.scala b/app/controllers/SignupController.scala
@@ -18,7 +18,7 @@ import modules.AppConfig
 import org.webjars.play.WebJarsUtil
 import play.api.data.Form
 import play.api.i18n.I18nSupport
-import play.api.mvc.{Action, AnyContent, InjectedController, Request, Result}
+import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents, Request, Result}
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.Try
 import serializers.Keys
@@ -34,6 +34,7 @@ import services.{
 @Singleton
 case class SignupController @Inject() (
     config: AppConfig,
+    val controllerComponents: ControllerComponents,
     dependencies: ServicesDependencies,
     eventService: EventService,
     groupService: UserGroupService,
@@ -42,7 +43,7 @@ case class SignupController @Inject() (
     signupService: SignupService,
     userService: UserService,
 )(implicit ec: ExecutionContext, webJarsUtil: WebJarsUtil)
-    extends InjectedController
+    extends BaseController
     with I18nSupport
     with Operators.Common
     with UserOperators {