Merge pull request #636 from xuwei-k/delete-all-implicit

mkurz · web-flow · commit c2ca2eef612f · 2025-07-05T08:27:08.000+02:00
remove all `implicit`. use `given` and `using`
diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala
@@ -73,27 +73,27 @@ class Application @Inject() (
     message.toSeq.map(Html.apply)
   }
 
-  def index = Action.async { implicit request =>
+  def index = Action.async { case given Request[AnyContent] =>
     membersSummariser.fetchMembers.map { members =>
       Ok(html.index(members, releases))
     }
   }
 
-  def widget(version: Option[String]) = Action.async { request =>
+  def widget(version: Option[String]) = Action.async { case given Request[AnyContent] =>
     Future.successful(
       Ok(views.html.widget(news(version))),
     )
   }
 
   // This used to be the download/getting-started page. We are keeping
   // the URL for SEO purposes only.
-  def download = Action.async { implicit request =>
+  def download = Action.async { case given Request[AnyContent] =>
     Future.successful(
       MovedPermanently(routes.Application.gettingStarted.path),
     )
   }
 
-  def gettingStarted = Action.async { implicit request =>
+  def gettingStarted = Action.async { case given Request[AnyContent] =>
     exampleProjectsService.cached() match {
       case Some(cached) =>
         val examples = toExamples(cached)
@@ -108,8 +108,8 @@ class Application @Inject() (
     }
   }
 
-  def allreleases(platform: Option[String] = None) = Action.async { implicit request =>
-    val selectedPlatform = Platform(platform.orElse(request.headers.get("User-Agent")))
+  def allreleases(platform: Option[String] = None) = Action.async { case given Request[AnyContent] =>
+    val selectedPlatform = Platform(platform.orElse(summon[Request[AnyContent]].headers.get("User-Agent")))
     Future.successful(
       Ok(html.allreleases(releases, selectedPlatform)),
     )
@@ -118,9 +118,7 @@ class Application @Inject() (
   def changelog =
     markdownAction(
       "public/markdown/changelog.md",
-      { implicit request =>
-        views.html.changelog(_)
-      },
+      views.html.changelog(_),
     )
 
   def conduct = Action {
@@ -130,17 +128,15 @@ class Application @Inject() (
   def communityProcess =
     markdownAction(
       "public/markdown/community-process.md",
-      { implicit request => markdown =>
-        views.html.markdownPage("Community process", markdown)
-      },
+      markdown => views.html.markdownPage("Community process", markdown),
     )
 
   def contributing = Action {
     Redirect("https://github.com/playframework/.github/blob/main/CONTRIBUTING.md")
   }
 
-  def markdownAction(markdownFile: String, template: RequestHeader => Html => Html) = Action.async {
-    implicit request =>
+  def markdownAction(markdownFile: String, template: RequestHeader ?=> Html => Html) = Action.async {
+    case given RequestHeader =>
       def readInputStream(is: InputStream): String =
         try {
           IOUtils.toString(is, "utf-8")
@@ -166,7 +162,7 @@ class Application @Inject() (
       page match {
         case Some(content) =>
           Future.successful(
-            Ok(template(request)(Html(content))).withHeaders(CACHE_CONTROL -> "max-age=10000"),
+            Ok(template(Html(content))).withHeaders(CACHE_CONTROL -> "max-age=10000"),
           )
         case None =>
           Future.successful(
@@ -175,13 +171,13 @@ class Application @Inject() (
       }
   }
 
-  def getInvolved = Action.async { implicit request =>
+  def getInvolved = Action.async { case given Request[AnyContent] =>
     Future.successful(
       Ok(html.getInvolved()),
     )
   }
 
-  def sponsors = Action.async { implicit request =>
+  def sponsors = Action.async { case given Request[AnyContent] =>
     Future.successful(
       Ok(html.sponsors()),
     )
@@ -192,7 +188,8 @@ class Application @Inject() (
     MovedPermanently(url)
   }
 
-  def onHandlerNotFound(route: String) = Action.async { implicit request =>
+  def onHandlerNotFound(route: String) = Action.async { case given Request[AnyContent] =>
+    val request = summon[Request[AnyContent]]
     if (
       route.startsWith("play-") && route.endsWith("-released") && !route
         .contains("-rc") && !route.contains("-m")
diff --git a/app/controllers/Blog.scala b/app/controllers/Blog.scala
@@ -28,25 +28,25 @@ class Blog @Inject() (
 
   val blogName = "Play Framework Blog"
 
-  def index() = Action.async { implicit request =>
+  def index() = Action.async { case given Request[AnyContent] =>
     Future.successful(
       Ok(html.blog.index(blogName)),
     )
   }
 
-  def graal() = Action.async { implicit request =>
+  def graal() = Action.async { case given Request[AnyContent] =>
     Future.successful(
       Ok(html.blog.graal(blogName, "Running Play on GraalVM")),
     )
   }
 
-  def socketio() = Action.async { implicit request =>
+  def socketio() = Action.async { case given Request[AnyContent] =>
     Future.successful(
       Ok(html.blog.socketio(blogName, "Play socket.io support")),
     )
   }
 
-  def ossPledgeLaunch() = Action.async { implicit request =>
+  def ossPledgeLaunch() = Action.async { case given Request[AnyContent] =>
     Future.successful(
       Ok(html.blog.ossPledgeLaunch(blogName, "Celebrating the Launch of the Open Source Pledge")),
     )
diff --git a/app/controllers/Code.scala b/app/controllers/Code.scala
@@ -3,17 +3,19 @@ package controllers
 import jakarta.inject.Inject
 
 import play.api.mvc.AbstractController
+import play.api.mvc.AnyContent
 import play.api.mvc.ControllerComponents
+import play.api.mvc.Request
 import services.github.ContributorsSummariser
 
 import scala.concurrent.ExecutionContext
 
-class Code @Inject() (contributorsSummariser: ContributorsSummariser, components: ControllerComponents)(implicit
+class Code @Inject() (contributorsSummariser: ContributorsSummariser, components: ControllerComponents)(using
     executionContext: ExecutionContext,
     reverseRouter: documentation.ReverseRouter,
 ) extends AbstractController(components) {
 
-  def index = Action.async { implicit req =>
+  def index = Action.async { case given Request[AnyContent] =>
     contributorsSummariser.fetchContributors.map { contributors =>
       Ok(views.html.code(contributors))
     }
diff --git a/app/controllers/Modules.scala b/app/controllers/Modules.scala
@@ -17,7 +17,7 @@ class Modules @Inject() (modulesLookup: ModulesLookup, moduleDao: ModuleDao, com
     reverseRouter: documentation.ReverseRouter,
 ) extends AbstractController(components) {
 
-  def index(keyword: String) = Action.async { implicit request =>
+  def index(keyword: String) = Action.async { case given Request[AnyContent] =>
     Future.successful(
       render {
         case Accepts.Html() =>
@@ -29,7 +29,7 @@ class Modules @Inject() (modulesLookup: ModulesLookup, moduleDao: ModuleDao, com
     )
   }
 
-  def download(name: String, version: String) = Action.async { implicit request =>
+  def download(name: String, version: String) = Action.async { case given Request[AnyContent] =>
     modulesLookup.findModule(name, version) match {
       case Some(zip) =>
         Future.successful(
@@ -42,20 +42,21 @@ class Modules @Inject() (modulesLookup: ModulesLookup, moduleDao: ModuleDao, com
     }
   }
 
-  def documentation(name: String, version: String, page: String) = Action.async { implicit request =>
-    modulesLookup.loadModuleDocumentation(name, version, page) match {
-      case Some(content) =>
-        Future.successful(
-          Ok(views.html.modules.documentation(name, content)),
-        )
-      case None =>
-        Future.successful(
-          PageNotFound,
-        )
-    }
+  def documentation(name: String, version: String, page: String) = Action.async {
+    case given Request[AnyContent] =>
+      modulesLookup.loadModuleDocumentation(name, version, page) match {
+        case Some(content) =>
+          Future.successful(
+            Ok(views.html.modules.documentation(name, content)),
+          )
+        case None =>
+          Future.successful(
+            PageNotFound,
+          )
+      }
   }
 
-  def show(name: String) = Action.async { implicit request =>
+  def show(name: String) = Action.async { case given Request[AnyContent] =>
     moduleDao.findById(name) match {
       case Some((module, releases)) =>
         Future.successful(
@@ -68,7 +69,7 @@ class Modules @Inject() (modulesLookup: ModulesLookup, moduleDao: ModuleDao, com
     }
   }
 
-  def dependencies(name: String, version: String) = Action.async { implicit request =>
+  def dependencies(name: String, version: String) = Action.async { case given Request[AnyContent] =>
     modulesLookup.findDependencies(name, version) match {
       case Some(yml) =>
         Future.successful(Ok(yml))
diff --git a/app/controllers/Outreachy.scala b/app/controllers/Outreachy.scala
@@ -3,7 +3,9 @@ package controllers
 import jakarta.inject.Inject
 
 import play.api.mvc.AbstractController
+import play.api.mvc.AnyContent
 import play.api.mvc.ControllerComponents
+import play.api.mvc.Request
 
 import scala.concurrent.Future
 
@@ -16,13 +18,13 @@ class Outreachy @Inject() (components: ControllerComponents)(using
 
   // def outreachy = Action(Redirect(routes.Outreachy.round15))
 
-  def round10 = Action.async { implicit req =>
+  def round10 = Action.async { case given Request[AnyContent] =>
     Future.successful(
       Ok(views.html.outreachy.round10()),
     )
   }
 
-  def round15 = Action.async { implicit req =>
+  def round15 = Action.async { case given Request[AnyContent] =>
     Future.successful(
       Ok(views.html.outreachy.round15()),
     )
diff --git a/app/controllers/Security.scala b/app/controllers/Security.scala
@@ -3,8 +3,10 @@ package controllers
 import jakarta.inject.Inject
 import jakarta.inject.Singleton
 
+import play.api.mvc.AnyContent
 import play.api.mvc.BaseController
 import play.api.mvc.ControllerComponents
+import play.api.mvc.Request
 import play.api.Environment
 import play.twirl.api.Html
 import utils.Markdown
@@ -13,12 +15,12 @@ import java.io.File
 import scala.concurrent.Future
 
 @Singleton
-class Security @Inject() (environment: Environment, val controllerComponents: ControllerComponents)(implicit
+class Security @Inject() (environment: Environment, val controllerComponents: ControllerComponents)(using
     val reverseRouter: documentation.ReverseRouter,
 ) extends BaseController
     with Common {
 
-  def vulnerability(name: String) = Action.async { implicit req =>
+  def vulnerability(name: String) = Action.async { case given Request[AnyContent] =>
     val path = "public/markdown/vulnerabilities/" + name
 
     // protect against dot dots
@@ -51,7 +53,7 @@ class Security @Inject() (environment: Environment, val controllerComponents: Co
     }
   }
 
-  def index = Action.async { implicit req =>
+  def index = Action.async { case given Request[AnyContent] =>
     Future.successful(
       Ok(views.html.vulnerabilities()).withHeaders(CACHE_CONTROL -> "max-age=1000"),
     )
diff --git a/app/controllers/documentation/DocumentationController.scala b/app/controllers/documentation/DocumentationController.scala
diff --git a/test/models/documentation/DocumentationSpec.scala b/test/models/documentation/DocumentationSpec.scala
diff --git a/test/services/github/GitHubSpec.scala b/test/services/github/GitHubSpec.scala

Original file line number	Diff line number	Diff line change
`@@ -73,27 +73,27 @@ class Application @Inject() (`
`73`	`73`	`message.toSeq.map(Html.apply)`
`74`	`74`	`}`
`75`	`75`
`76`		`- def index = Action.async { implicit request =>`
	`76`	`+ def index = Action.async { case given Request[AnyContent] =>`
`77`	`77`	`membersSummariser.fetchMembers.map { members =>`
`78`	`78`	`Ok(html.index(members, releases))`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`82`		`- def widget(version: Option[String]) = Action.async { request =>`
	`82`	`+ def widget(version: Option[String]) = Action.async { case given Request[AnyContent] =>`
`83`	`83`	`Future.successful(`
`84`	`84`	`Ok(views.html.widget(news(version))),`
`85`	`85`	`)`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`// This used to be the download/getting-started page. We are keeping`
`89`	`89`	`// the URL for SEO purposes only.`
`90`		`- def download = Action.async { implicit request =>`
	`90`	`+ def download = Action.async { case given Request[AnyContent] =>`
`91`	`91`	`Future.successful(`
`92`	`92`	`MovedPermanently(routes.Application.gettingStarted.path),`
`93`	`93`	`)`
`94`	`94`	`}`
`95`	`95`
`96`		`- def gettingStarted = Action.async { implicit request =>`
	`96`	`+ def gettingStarted = Action.async { case given Request[AnyContent] =>`
`97`	`97`	`exampleProjectsService.cached() match {`
`98`	`98`	`case Some(cached) =>`
`99`	`99`	`val examples = toExamples(cached)`
`@@ -108,8 +108,8 @@ class Application @Inject() (`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`111`		`- def allreleases(platform: Option[String] = None) = Action.async { implicit request =>`
`112`		`- val selectedPlatform = Platform(platform.orElse(request.headers.get("User-Agent")))`
	`111`	`+ def allreleases(platform: Option[String] = None) = Action.async { case given Request[AnyContent] =>`
	`112`	`+ val selectedPlatform = Platform(platform.orElse(summon[Request[AnyContent]].headers.get("User-Agent")))`
`113`	`113`	`Future.successful(`
`114`	`114`	`Ok(html.allreleases(releases, selectedPlatform)),`
`115`	`115`	`)`
`@@ -118,9 +118,7 @@ class Application @Inject() (`
`118`	`118`	`def changelog =`
`119`	`119`	`markdownAction(`
`120`	`120`	`"public/markdown/changelog.md",`
`121`		`- { implicit request =>`
`122`		`- views.html.changelog(_)`
`123`		`- },`
	`121`	`+ views.html.changelog(_),`
`124`	`122`	`)`
`125`	`123`
`126`	`124`	`def conduct = Action {`
`@@ -130,17 +128,15 @@ class Application @Inject() (`
`130`	`128`	`def communityProcess =`
`131`	`129`	`markdownAction(`
`132`	`130`	`"public/markdown/community-process.md",`
`133`		`- { implicit request => markdown =>`
`134`		`- views.html.markdownPage("Community process", markdown)`
`135`		`- },`
	`131`	`+ markdown => views.html.markdownPage("Community process", markdown),`
`136`	`132`	`)`
`137`	`133`
`138`	`134`	`def contributing = Action {`
`139`	`135`	`Redirect("https://github.com/playframework/.github/blob/main/CONTRIBUTING.md")`
`140`	`136`	`}`
`141`	`137`
`142`		`- def markdownAction(markdownFile: String, template: RequestHeader => Html => Html) = Action.async {`
`143`		`- implicit request =>`
	`138`	`+ def markdownAction(markdownFile: String, template: RequestHeader ?=> Html => Html) = Action.async {`
	`139`	`+ case given RequestHeader =>`
`144`	`140`	`def readInputStream(is: InputStream): String =`
`145`	`141`	`try {`
`146`	`142`	`IOUtils.toString(is, "utf-8")`
`@@ -166,7 +162,7 @@ class Application @Inject() (`
`166`	`162`	`page match {`
`167`	`163`	`case Some(content) =>`
`168`	`164`	`Future.successful(`
`169`		`- Ok(template(request)(Html(content))).withHeaders(CACHE_CONTROL -> "max-age=10000"),`
	`165`	`+ Ok(template(Html(content))).withHeaders(CACHE_CONTROL -> "max-age=10000"),`
`170`	`166`	`)`
`171`	`167`	`case None =>`
`172`	`168`	`Future.successful(`
`@@ -175,13 +171,13 @@ class Application @Inject() (`
`175`	`171`	`}`
`176`	`172`	`}`
`177`	`173`
`178`		`- def getInvolved = Action.async { implicit request =>`
	`174`	`+ def getInvolved = Action.async { case given Request[AnyContent] =>`
`179`	`175`	`Future.successful(`
`180`	`176`	`Ok(html.getInvolved()),`
`181`	`177`	`)`
`182`	`178`	`}`
`183`	`179`
`184`		`- def sponsors = Action.async { implicit request =>`
	`180`	`+ def sponsors = Action.async { case given Request[AnyContent] =>`
`185`	`181`	`Future.successful(`
`186`	`182`	`Ok(html.sponsors()),`
`187`	`183`	`)`
`@@ -192,7 +188,8 @@ class Application @Inject() (`
`192`	`188`	`MovedPermanently(url)`
`193`	`189`	`}`
`194`	`190`
`195`		`- def onHandlerNotFound(route: String) = Action.async { implicit request =>`
	`191`	`+ def onHandlerNotFound(route: String) = Action.async { case given Request[AnyContent] =>`
	`192`	`+ val request = summon[Request[AnyContent]]`
`196`	`193`	`if (`
`197`	`194`	`route.startsWith("play-") && route.endsWith("-released") && !route`
`198`	`195`	`.contains("-rc") && !route.contains("-m")`
Original file line number	Diff line number	Diff line change
`@@ -28,25 +28,25 @@ class Blog @Inject() (`
`28`	`28`
`29`	`29`	`val blogName = "Play Framework Blog"`
`30`	`30`
`31`		`- def index() = Action.async { implicit request =>`
	`31`	`+ def index() = Action.async { case given Request[AnyContent] =>`
`32`	`32`	`Future.successful(`
`33`	`33`	`Ok(html.blog.index(blogName)),`
`34`	`34`	`)`
`35`	`35`	`}`
`36`	`36`
`37`		`- def graal() = Action.async { implicit request =>`
	`37`	`+ def graal() = Action.async { case given Request[AnyContent] =>`
`38`	`38`	`Future.successful(`
`39`	`39`	`Ok(html.blog.graal(blogName, "Running Play on GraalVM")),`
`40`	`40`	`)`
`41`	`41`	`}`
`42`	`42`
`43`		`- def socketio() = Action.async { implicit request =>`
	`43`	`+ def socketio() = Action.async { case given Request[AnyContent] =>`
`44`	`44`	`Future.successful(`
`45`	`45`	`Ok(html.blog.socketio(blogName, "Play socket.io support")),`
`46`	`46`	`)`
`47`	`47`	`}`
`48`	`48`
`49`		`- def ossPledgeLaunch() = Action.async { implicit request =>`
	`49`	`+ def ossPledgeLaunch() = Action.async { case given Request[AnyContent] =>`
`50`	`50`	`Future.successful(`
`51`	`51`	`Ok(html.blog.ossPledgeLaunch(blogName, "Celebrating the Launch of the Open Source Pledge")),`
`52`	`52`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,9 @@ package controllers`
`3`	`3`	`import jakarta.inject.Inject`
`4`	`4`
`5`	`5`	`import play.api.mvc.AbstractController`
	`6`	`+import play.api.mvc.AnyContent`
`6`	`7`	`import play.api.mvc.ControllerComponents`
	`8`	`+import play.api.mvc.Request`
`7`	`9`
`8`	`10`	`import scala.concurrent.Future`
`9`	`11`
`@@ -16,13 +18,13 @@ class Outreachy @Inject() (components: ControllerComponents)(using`
`16`	`18`
`17`	`19`	`// def outreachy = Action(Redirect(routes.Outreachy.round15))`
`18`	`20`
`19`		`- def round10 = Action.async { implicit req =>`
	`21`	`+ def round10 = Action.async { case given Request[AnyContent] =>`
`20`	`22`	`Future.successful(`
`21`	`23`	`Ok(views.html.outreachy.round10()),`
`22`	`24`	`)`
`23`	`25`	`}`
`24`	`26`
`25`		`- def round15 = Action.async { implicit req =>`
	`27`	`+ def round15 = Action.async { case given Request[AnyContent] =>`
`26`	`28`	`Future.successful(`
`27`	`29`	`Ok(views.html.outreachy.round15()),`
`28`	`30`	`)`