Skip to content

Commit 4c30ee7

Browse files
committed
use given and using instead of implicit
1 parent a9f853a commit 4c30ee7

51 files changed

Lines changed: 94 additions & 95 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

app/actors/DocumentationActor.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ class DocumentationActor(
271271
import DocumentationActor._
272272
import actors.{ DocumentationLoadingActor => Loader }
273273

274-
implicit val timeout: Timeout = Timeout(5.seconds)
275-
implicit val system: ActorSystem[Nothing] = context.system
274+
given timeout: Timeout = Timeout(5.seconds)
275+
given system: ActorSystem[Nothing] = context.system
276276
import system.executionContext
277277

278278
private def createRepo(config: TranslationConfig) = {

app/actors/DocumentationPollingActor.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class DocumentationPollingActor(
120120
// The version hasn't changed, don't rescan
121121
case Some(same: TranslationVersion) if same.cacheId == newCacheId => same
122122
case _ =>
123-
implicit val lang = repos.default.config.lang
123+
given lang: Lang = repos.default.config.lang
124124

125125
if (old.isDefined) {
126126
log.info2("Updating default documentation for {}: {}", version, cacheId)
@@ -151,8 +151,8 @@ class DocumentationPollingActor(
151151
).map(v => (v._1, v._2, v._1.name))
152152
val mainVersion = determineMainVersion(t).map(v => (v._1, v._2, "main"))
153153

154-
implicit val lang = t.config.lang
155-
val versions = versionsToTranslations(
154+
given lang: Lang = t.config.lang
155+
val versions = versionsToTranslations(
156156
t.repo,
157157
gitTags ++ gitBranches ++ mainVersion,
158158
defaultTranslation,
@@ -179,7 +179,7 @@ class DocumentationPollingActor(
179179
versions: Seq[(Version, ObjectId, String)],
180180
aggregate: Translation,
181181
old: Option[Translation],
182-
)(implicit lang: Lang): List[TranslationVersion] = {
182+
)(using lang: Lang): List[TranslationVersion] = {
183183
versions
184184
.sortBy(_._1)
185185
.reverse

app/controllers/Application.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Application @Inject() (
2828
exampleProjectsService: PlayExampleProjectsService,
2929
components: ControllerComponents,
3030
cacheApi: SyncCacheApi,
31-
)(implicit ec: ExecutionContext, val reverseRouter: _root_.controllers.documentation.ReverseRouter)
31+
)(using ec: ExecutionContext, val reverseRouter: _root_.controllers.documentation.ReverseRouter)
3232
extends AbstractController(components)
3333
with Common
3434
with I18nSupport {

app/controllers/Blog.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import scala.concurrent.Future
2121
@Singleton
2222
class Blog @Inject() (
2323
components: ControllerComponents,
24-
)(implicit ec: ExecutionContext, val reverseRouter: _root_.controllers.documentation.ReverseRouter)
24+
)(using ec: ExecutionContext, val reverseRouter: _root_.controllers.documentation.ReverseRouter)
2525
extends AbstractController(components)
2626
with Common
2727
with I18nSupport {

app/controllers/Common.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import play.api.mvc._
44
import play.api.mvc.Results._
55

66
trait Common {
7-
def notFound(implicit request: RequestHeader) = NotFound(views.html.notfound())
7+
def notFound(using request: RequestHeader) = NotFound(views.html.notfound())
88

9-
implicit def reverseRouter: documentation.ReverseRouter
9+
given reverseRouter: documentation.ReverseRouter
1010
}

app/controllers/Modules.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import scala.concurrent.Future
1212

1313
@Singleton
1414
class Modules @Inject() (modulesLookup: ModulesLookup, moduleDao: ModuleDao, components: ControllerComponents)(
15-
implicit
15+
using
1616
ec: ExecutionContext,
1717
reverseRouter: documentation.ReverseRouter,
1818
) extends AbstractController(components) {
@@ -77,5 +77,5 @@ class Modules @Inject() (modulesLookup: ModulesLookup, moduleDao: ModuleDao, com
7777
}
7878
}
7979

80-
private def PageNotFound(implicit request: RequestHeader) = NotFound(views.html.notfound())
80+
private def PageNotFound(using request: RequestHeader) = NotFound(views.html.notfound())
8181
}

app/controllers/Outreachy.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import scala.concurrent.Future
1010
/**
1111
* The outreachy controller
1212
*/
13-
class Outreachy @Inject() (components: ControllerComponents)(implicit
13+
class Outreachy @Inject() (components: ControllerComponents)(using
1414
reverseRouter: documentation.ReverseRouter,
1515
) extends AbstractController(components) {
1616

app/controllers/documentation/DocumentationController.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ class DocumentationController @Inject() (
3333
documentationActor: ActorRef[Command],
3434
releases: PlayReleases,
3535
components: ControllerComponents,
36-
)(implicit actorSystem: org.apache.pekko.actor.ActorSystem, reverseRouter: ReverseRouter)
36+
)(using actorSystem: org.apache.pekko.actor.ActorSystem, reverseRouter: ReverseRouter)
3737
extends AbstractController(components) {
3838

39-
private implicit val timeout: Timeout = Timeout(10.seconds)
40-
private implicit val typedSystem: ActorSystem[Nothing] = actorSystem.toTyped
39+
private given timeout: Timeout = Timeout(10.seconds)
40+
private given typedSystem: ActorSystem[Nothing] = actorSystem.toTyped
4141
import typedSystem.executionContext
4242

4343
private val Rfc1123DateTimeFormat = DateTimeFormat.forPattern("EEE, dd MMM yyyy HH:mm:ss 'GMT'").withZoneUTC()
4444

4545
private val EmptyContext = TranslationContext(Lang("en"), true, None, Nil, Nil)
4646

47-
private def pageNotFound(context: TranslationContext, title: String, alternateVersions: Seq[Version])(implicit
47+
private def pageNotFound(context: TranslationContext, title: String, alternateVersions: Seq[Version])(using
4848
req: RequestHeader,
4949
) =
5050
NotFound(views.html.documentation.v2(messages, context, title, alternateVersions = alternateVersions))
@@ -81,7 +81,7 @@ class DocumentationController @Inject() (
8181
}
8282
}
8383

84-
private def preferredLang(langs: Seq[Lang])(implicit request: RequestHeader) = {
84+
private def preferredLang(langs: Seq[Lang])(using request: RequestHeader) = {
8585
val maybeLangFromCookie = request.cookies.get(messages.langCookieName).flatMap(c => Lang.get(c.value))
8686
val candidateLangs = maybeLangFromCookie match {
8787
case Some(cookieLang) => cookieLang +: request.acceptLanguages
@@ -97,7 +97,7 @@ class DocumentationController @Inject() (
9797
actor: ActorRef[Command],
9898
page: String,
9999
msg: ActorRef[Response[T]] => DocumentationActor.Request[T],
100-
)(block: T => Result)(implicit req: RequestHeader): Future[Result] = {
100+
)(block: T => Result)(using req: RequestHeader): Future[Result] = {
101101
actor.ask[Response[T]](replyTo => msg(replyTo)).flatMap {
102102
case DocsNotFound(context) =>
103103
val future = Future.sequence(context.displayVersions.map(pageExists(_, page)))
@@ -371,7 +371,7 @@ class DocumentationController @Inject() (
371371
}
372372
}
373373

374-
def withLangHeaders(result: Result, page: String, context: TranslationContext)(implicit
374+
def withLangHeaders(result: Result, page: String, context: TranslationContext)(using
375375
req: RequestHeader,
376376
) = {
377377
val linkHeader = context.alternatives

app/models/PlayExampleProjects.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ case class TemplateParameter(
2626
)
2727

2828
object TemplateParameter {
29-
implicit val format: Format[TemplateParameter] = Json.format
29+
given format: Format[TemplateParameter] = Json.format
3030
}
3131

3232
case class ExampleProject(
@@ -42,7 +42,7 @@ case class ExampleProject(
4242
}
4343

4444
object ExampleProject {
45-
implicit val format: Format[ExampleProject] = Json.format
45+
given format: Format[ExampleProject] = Json.format
4646
}
4747

4848
class ExamplesModule extends AbstractModule {
@@ -57,7 +57,7 @@ class PlayExampleProjectsService @Inject() (
5757
ws: WSClient,
5858
cache: SyncCacheApi,
5959
environment: Environment,
60-
)(implicit ec: ExecutionContext) {
60+
)(using ec: ExecutionContext) {
6161

6262
val validPlayVersions: Seq[String] = configuration.get[Seq[String]]("examples.playVersions")
6363

app/models/Releases.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ case class PlayRelease(
1414
}
1515

1616
object PlayRelease {
17-
implicit val releaseReads: Reads[PlayRelease] = Json.reads[PlayRelease]
17+
given releaseReads: Reads[PlayRelease] = Json.reads[PlayRelease]
1818
}
1919

2020
case class PlayReleases(
@@ -25,7 +25,7 @@ case class PlayReleases(
2525
)
2626

2727
object PlayReleases {
28-
implicit val playReleasesReads: Reads[PlayReleases] = Json.reads[PlayReleases]
28+
given playReleasesReads: Reads[PlayReleases] = Json.reads[PlayReleases]
2929
}
3030

3131
private[models] object SecurifyUrl {

0 commit comments

Comments
 (0)