Merge pull request #1365 from yadavan88/upgrade-play-scala3

lor6 · web-flow · commit dc4995eaf9e2 · 2024-05-26T14:49:56.000+03:00
Upgrade play modules to scala 3
diff --git a/play-scala/application-tests/app/com/baeldung/arrival/db/manager/DbManager.scala b/play-scala/application-tests/app/com/baeldung/arrival/db/manager/DbManager.scala
@@ -7,7 +7,7 @@ import scala.concurrent.Future
 
 trait DbManager {
 
-  def dbConfig: DatabaseConfig[_]
+  def dbConfig: DatabaseConfig[?]
 
   def execute[T](dbio: DBIO[T]): Future[T] = dbConfig.db.run(dbio)
 
diff --git a/play-scala/application-tests/app/com/baeldung/arrival/db/repository/SlickArrivalRepository.scala b/play-scala/application-tests/app/com/baeldung/arrival/db/repository/SlickArrivalRepository.scala
@@ -26,7 +26,7 @@ class SlickArrivalRepository @Inject() (val dbProfile: JdbcProfile)(implicit
       origin,
       destination,
       plane
-    ) <> ((Arrival.apply _).tupled, Arrival.unapply)
+    ) <> ((Arrival.apply).tupled, Arrival.unapply)
   }
 
   /** The starting point for all queries on the people table.
diff --git a/play-scala/application-tests/app/com/baeldung/arrival/service/ArrivalDecoratorService.scala b/play-scala/application-tests/app/com/baeldung/arrival/service/ArrivalDecoratorService.scala
@@ -19,7 +19,7 @@ class ArrivalDecoratorService @Inject() (configuration: Configuration) {
   private val maximumMediumNameLength =
     configuration.get[Int]("medium-name-max")
 
-  def decorate(undecorated: Arrival): Arrival with Size = new Arrival(
+  def decorate(undecorated: Arrival): Arrival & Size = new Arrival(
     undecorated.planeId,
     undecorated.origin,
     undecorated.destination,
diff --git a/play-scala/application-tests/build.sbt b/play-scala/application-tests/build.sbt
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
 
 enablePlugins(PlayScala)
 
-scalaVersion := ScalaVersions.scala2Version
+scalaVersion := ScalaVersions.scala3Version
 
 libraryDependencies += guice
 libraryDependencies += "com.h2database" % "h2" % "1.4.200"
diff --git a/play-scala/application-tests/test/com/baeldung/arrival/actions/SourceActionsUnitTest.scala b/play-scala/application-tests/test/com/baeldung/arrival/actions/SourceActionsUnitTest.scala
@@ -7,6 +7,7 @@ import play.api.http.Status.{BAD_REQUEST, NO_CONTENT}
 import play.api.mvc.Headers
 import play.api.mvc.Results.NoContent
 import play.api.test.{FakeRequest, Helpers}
+import play.api.mvc.{Action, AnyContent}
 
 class SourceActionsUnitTest
   extends AnyWordSpec
@@ -20,15 +21,17 @@ class SourceActionsUnitTest
 
   "SourceAction" should {
     "return BAD_REQUEST status for missing source header" in {
-      val testee = SourceAction(anyContentParser)(globalEc) { _ => NoContent }
+      val testee: Action[AnyContent] =
+        SourceAction(anyContentParser)(globalEc) { _ => NoContent }
 
       whenReady(testee.apply(FakeRequest())) { result =>
         assert(result.header.status === BAD_REQUEST)
       }
     }
 
     "return NO_CONTENT status for when source header is present" in {
-      val testee = SourceAction(anyContentParser)(globalEc) { _ => NoContent }
+      val testee: Action[AnyContent] =
+        SourceAction(anyContentParser)(globalEc) { _ => NoContent }
       whenReady(
         testee.apply(FakeRequest().withHeaders(Headers("source" -> "foo")))
       ) { result =>
diff --git a/play-scala/application-tests/test/com/baeldung/arrival/service/ArrivalDecoratorServiceUnitTest.scala b/play-scala/application-tests/test/com/baeldung/arrival/service/ArrivalDecoratorServiceUnitTest.scala
@@ -17,11 +17,13 @@ class ArrivalDecoratorServiceUnitTest extends MixedPlaySpec {
         )
         .build()
     ) {
-      private val testee = app.injector.instanceOf[ArrivalDecoratorService]
-      private val arrival = Arrival(1L, "Athens", "Heathrow", "12345")
-      assert(testee.decorate(arrival).short)
-      assert(!testee.decorate(arrival).medium)
-      assert(!testee.decorate(arrival).long)
+      override def running() = {
+        val testee = app.injector.instanceOf[ArrivalDecoratorService]
+        val arrival = Arrival(1L, "Athens", "Heathrow", "12345")
+        assert(testee.decorate(arrival).short)
+        assert(!testee.decorate(arrival).medium)
+        assert(!testee.decorate(arrival).long)
+      }
     }
 
     "mark as medium an arrival with plane name length = 5 with overridden configuration" in new App(
@@ -37,11 +39,13 @@ class ArrivalDecoratorServiceUnitTest extends MixedPlaySpec {
         )
         .build()
     ) {
-      private val testee = app.injector.instanceOf[ArrivalDecoratorService]
-      private val arrival = Arrival(1L, "Athens", "Heathrow", "12345")
-      assert(!testee.decorate(arrival).short)
-      assert(testee.decorate(arrival).medium)
-      assert(!testee.decorate(arrival).long)
+      override def running() = {
+        val testee = app.injector.instanceOf[ArrivalDecoratorService]
+        val arrival = Arrival(1L, "Athens", "Heathrow", "12345")
+        assert(!testee.decorate(arrival).short)
+        assert(testee.decorate(arrival).medium)
+        assert(!testee.decorate(arrival).long)
+      }
     }
   }
 
diff --git a/play-scala/application-tests/test/com/baeldung/arrival/service/isolated/InMemoryDbManager.scala b/play-scala/application-tests/test/com/baeldung/arrival/service/isolated/InMemoryDbManager.scala
@@ -7,7 +7,7 @@ import slick.dbio.{DBIO, SuccessAction}
 import scala.concurrent.Future
 
 class InMemoryDbManager extends DbManager {
-  override def dbConfig: DatabaseConfig[_] = ???
+  override def dbConfig: DatabaseConfig[?] = ???
 
   override def execute[T](dbio: DBIO[T]): Future[T] =
     Future.successful(dbio.asInstanceOf[SuccessAction[T]].value)
diff --git a/play-scala/async-tasks/build.sbt b/play-scala/async-tasks/build.sbt
@@ -5,6 +5,6 @@ version := "1.0-SNAPSHOT"
 
 enablePlugins(PlayScala)
 
-scalaVersion := ScalaVersions.scala2Version
+scalaVersion := ScalaVersions.scala3Version
 
 libraryDependencies += guice
diff --git a/play-scala/caching-in-play/build.sbt b/play-scala/caching-in-play/build.sbt
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
 
 enablePlugins(PlayScala)
 
-scalaVersion := ScalaVersions.scala2Version
+scalaVersion := ScalaVersions.scala3Version
 
 libraryDependencies += guice
 libraryDependencies += caffeine
diff --git a/play-scala/configuration-access/build.sbt b/play-scala/configuration-access/build.sbt
@@ -5,11 +5,11 @@ version := "1.0-SNAPSHOT"
 
 enablePlugins(PlayScala)
 
-scalaVersion := ScalaVersions.scala2Version
+scalaVersion := ScalaVersions.scala3Version
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test
-libraryDependencies += "org.mockito" % "mockito-scala_2.13" % "1.17.31" % Test
+libraryDependencies += "org.scalatestplus" %% "mockito-3-4" % "3.2.10.0"
 
 // Adds additional packages into Twirl
 //TwirlKeys.templateImports += "com.baeldung.controllers._"
diff --git a/play-scala/configuration-access/test/controllers/HomeControllerUnitTest.scala b/play-scala/configuration-access/test/controllers/HomeControllerUnitTest.scala
@@ -1,11 +1,11 @@
 package controllers
 
-import org.mockito.MockitoSugar
 import org.scalatestplus.play._
 import org.scalatestplus.play.guice._
 import play.api.test.Helpers._
 import play.api.test._
 import services.MyService
+import org.scalatestplus.mockito.MockitoSugar
 
 /** Add your spec here. You can mock out a whole application including requests,
   * plugins etc.
diff --git a/play-scala/configuration-access/test/services/MyServiceUnitTest.scala b/play-scala/configuration-access/test/services/MyServiceUnitTest.scala
@@ -2,10 +2,10 @@ package services
 
 import java.util.{Calendar, Date, TimeZone}
 
-import org.mockito.MockitoSugar
 import org.scalatestplus.play._
 import org.scalatestplus.play.guice._
 import play.api.test._
+import org.scalatestplus.mockito.MockitoSugar
 
 class MyServiceUnitTest
   extends PlaySpec
diff --git a/play-scala/custom-error-handling/build.sbt b/play-scala/custom-error-handling/build.sbt
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
 
 enablePlugins(PlayScala)
 
-scalaVersion := ScalaVersions.scala2Version
+scalaVersion := ScalaVersions.scala3Version
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test
diff --git a/play-scala/dependency-injection/app/macwire/components/OrderComponents.scala b/play-scala/dependency-injection/app/macwire/components/OrderComponents.scala
@@ -12,7 +12,7 @@ import macwire.services.{
   OrderService
 }
 
-trait OrderComponents extends {
+trait OrderComponents {
 
   lazy val p1: OrderPipelineProcessor = (order: Order) =>
     println("Processor 1 processed")
diff --git a/play-scala/dependency-injection/build.sbt b/play-scala/dependency-injection/build.sbt
@@ -4,7 +4,7 @@ version := "1.0-SNAPSHOT"
 
 enablePlugins(PlayScala)
 
-scalaVersion := ScalaVersions.scala2Version
+scalaVersion := ScalaVersions.scala3Version
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test
diff --git a/play-scala/dependency-injection/test/guice/service/ServiceWithRemoteCallUnitTest.scala b/play-scala/dependency-injection/test/guice/service/ServiceWithRemoteCallUnitTest.scala
@@ -20,8 +20,10 @@ class ServiceWithRemoteCallUnitTest
         .overrides(new MockApiModule, new ServiceModule)
         .build()
       new App(application) {
-        val srv = app.injector.instanceOf[ServiceWithRemoteCall]
-        assert(srv.call() == "Mock remote api call")
+        override def running() = {
+          val srv = app.injector.instanceOf[ServiceWithRemoteCall]
+          assert(srv.call() == "Mock remote api call")
+        }
       }
     }
 
@@ -30,8 +32,10 @@ class ServiceWithRemoteCallUnitTest
         .overrides(new ApiModule, new ServiceModule)
         .build()
       new App(application) {
-        val srv = app.injector.instanceOf[ServiceWithRemoteCall]
-        assert(srv.call() == "Real remote api call")
+        override def running() = {
+          val srv = app.injector.instanceOf[ServiceWithRemoteCall]
+          assert(srv.call() == "Real remote api call")
+        }
       }
     }
 
diff --git a/play-scala/introduction-to-play/build.sbt b/play-scala/introduction-to-play/build.sbt
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
 
 enablePlugins(PlayScala)
 
-scalaVersion := ScalaVersions.scala2Version
+scalaVersion := ScalaVersions.scala3Version
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test
diff --git a/play-scala/introduction-to-play/conf/routes b/play-scala/introduction-to-play/conf/routes
@@ -4,7 +4,7 @@
 # ~~~~
 
 # An example controller showing a sample home page
-GET     /                           controllers.HomeController.index
+GET     /                           controllers.HomeController.index()
 GET     /sum/:first/:second         controllers.HomeController.printSum(first: Long, second: Long)
 
 # Map static resources from the /public folder to the /assets URL path
diff --git a/play-scala/play-static-assets/build.sbt b/play-scala/play-static-assets/build.sbt
@@ -6,7 +6,7 @@ version := "1.0-SNAPSHOT"
 enablePlugins(PlayScala)
 enablePlugins(SbtWeb)
 
-scalaVersion := ScalaVersions.scala2Version
+scalaVersion := ScalaVersions.scala3Version
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test
diff --git a/play-scala/play-templates/app/controllers/MenuController.scala b/play-scala/play-templates/app/controllers/MenuController.scala
@@ -10,7 +10,7 @@ class MenuController @Inject() (
   cc: ControllerComponents
 ) extends AbstractController(cc) {
 
-  def availableProducts = Action { implicit request =>
+  def availableProducts = Action {
     val products = List(
       Product("coffee", 8.99, true),
       Product("cake", 12.00, true),
diff --git a/play-scala/play-templates/app/controllers/ViewTemplateController.scala b/play-scala/play-templates/app/controllers/ViewTemplateController.scala
@@ -8,7 +8,7 @@ case class Article(title: String, url: String)
 class ViewTemplateController @Inject() (cc: ControllerComponents)
   extends AbstractController(cc) {
 
-  def index = Action { implicit request =>
+  def index = Action {
     val articles = List(
       (
         "Introduction to Play Framework",
@@ -22,7 +22,7 @@ class ViewTemplateController @Inject() (cc: ControllerComponents)
     Ok(views.html.Baeldung.index(articles))
   }
 
-  def withClass = Action { implicit request =>
+  def withClass = Action {
     val articles = List(
       Article(
         "Introduction to Play Framework",
diff --git a/play-scala/play-templates/build.sbt b/play-scala/play-templates/build.sbt
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
 
 enablePlugins(PlayScala)
 
-scalaVersion := ScalaVersions.scala2Version
+scalaVersion := ScalaVersions.scala3Version
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test
diff --git a/play-scala/play-templates/test/controllers/MenuControllerUnitTest.scala b/play-scala/play-templates/test/controllers/MenuControllerUnitTest.scala
@@ -17,13 +17,12 @@ class MenuControllerUnitTest
 
       val controller = new MenuController(template, stubControllerComponents())
 
-      val result = controller
-        .availableProducts()
+      val result = controller.availableProducts
         .apply(
           FakeRequest(GET, "/menu")
         )
 
-      contentAsString(result) must include("coffee 8,99 €")
+      contentAsString(result) `must` include("coffee 8,99 €")
     }
   }
 }
diff --git a/play-scala/play-templates/test/controllers/ViewTemplateControllerUnitTest.scala b/play-scala/play-templates/test/controllers/ViewTemplateControllerUnitTest.scala
@@ -13,8 +13,7 @@ class ViewTemplateControllerUnitTest
 
     "should return two articles" in {
       val controller = new ViewTemplateController(stubControllerComponents())
-      val result = controller
-        .index()
+      val result = controller.index
         .apply(
           FakeRequest(GET, "/template")
         )
@@ -27,8 +26,7 @@ class ViewTemplateControllerUnitTest
 
     "with_class function returns the same two articles" in {
       val controller = new ViewTemplateController(stubControllerComponents())
-      val result = controller
-        .withClass()
+      val result = controller.withClass
         .apply(
           FakeRequest(GET, "/withclass")
         )
diff --git a/play-scala/rest-api/app/controllers/TodoListController.scala b/play-scala/rest-api/app/controllers/TodoListController.scala
@@ -54,7 +54,7 @@ class TodoListController @Inject() (
   }
 
   // curl -v -d '{"description": "some new item"}' -H 'Content-Type: application/json' -X POST localhost:9000/todo
-  def addNewItem() = Action { implicit request =>
+  def addNewItem(): Action[AnyContent] = Action { request =>
     val content = request.body
     val jsonObject = content.asJson
 
diff --git a/play-scala/rest-api/build.sbt b/play-scala/rest-api/build.sbt
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
 
 enablePlugins(PlayScala)
 
-scalaVersion := ScalaVersions.scala2Version
+scalaVersion := ScalaVersions.scala3Version
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test
diff --git a/play-scala/rest-api/conf/routes b/play-scala/rest-api/conf/routes
@@ -7,8 +7,8 @@
 
 # Map static resources from the /public folder to the /assets URL path
 
-GET     /todo                       controllers.TodoListController.getAll
+GET     /todo                       controllers.TodoListController.getAll()
 GET     /todo/:itemId               controllers.TodoListController.getById(itemId: Long)
 PUT     /todo/done/:itemId          controllers.TodoListController.markAsDone(itemId: Long)
-DELETE  /todo/done                  controllers.TodoListController.deleteAllDone
-POST    /todo                       controllers.TodoListController.addNewItem
+DELETE  /todo/done                  controllers.TodoListController.deleteAllDone()
+POST    /todo                       controllers.TodoListController.addNewItem()
diff --git a/sbt-standalone/build.sbt b/sbt-standalone/build.sbt
@@ -2,7 +2,7 @@ name := "SCALA-156"
 
 version := "0.1"
 
-scalaVersion := "2.13.6"
+scalaVersion := "3.4.1"
 
 // Setting target for Scala
 scalacOptions += "-target:17"
diff --git a/sbt-standalone/project/build.properties b/sbt-standalone/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.10.0
diff --git a/scala-graalvm/scala-graalvm-http-app/build.sbt b/scala-graalvm/scala-graalvm-http-app/build.sbt
@@ -3,7 +3,7 @@ organization := "com.baeldung"
 
 version := "1.0-SNAPSHOT"
 
-scalaVersion := "2.13.14"
+scalaVersion := "3.4.1"
 libraryDependencies ++= Seq(
   "com.typesafe.akka" %% "akka-actor" % "2.8.0",
   "com.typesafe.akka" %% "akka-stream" % "2.8.0",
diff --git a/scala-graalvm/scala-graalvm-http-app/project/build.properties b/scala-graalvm/scala-graalvm-http-app/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.10.0
diff --git a/scala-sbt/intro-to-sbt/build.sbt b/scala-sbt/intro-to-sbt/build.sbt
@@ -1,6 +1,6 @@
 import Dependencies._
 
-ThisBuild / scalaVersion := "2.13.14"
+ThisBuild / scalaVersion := "3.4.1"
 ThisBuild / version := "0.1.0-SNAPSHOT"
 
 lazy val printHello = taskKey[Unit]("prints hello")
diff --git a/scala-sbt/intro-to-sbt/project/build.properties b/scala-sbt/intro-to-sbt/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.10.0

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class SlickArrivalRepository @Inject() (val dbProfile: JdbcProfile)(implicit`
`26`	`26`	`origin,`
`27`	`27`	`destination,`
`28`	`28`	`plane`
`29`		`- ) <> ((Arrival.apply _).tupled, Arrival.unapply)`
	`29`	`+ ) <> ((Arrival.apply).tupled, Arrival.unapply)`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`/** The starting point for all queries on the people table.`