Skip to content

Commit

Permalink
Merge pull request #927 from xuwei-k/scalafmt-wildcard
Browse files Browse the repository at this point in the history
update `.scalafmt.conf`. enforce new wildcard syntax
  • Loading branch information
mergify[bot] authored Jan 19, 2025
2 parents 752b810 + 412603c commit a990d83
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
7 changes: 7 additions & 0 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,10 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi
rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ]
spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy }
trailingCommas = preserve
rewrite.scala3.convertToNewSyntax = true
rewrite.scala3.newSyntax.control = false
runner.dialectOverride {
allowSignificantIndentation = false
allowAsForImportRename = false
allowStarWildcardImport = false
}
2 changes: 1 addition & 1 deletion src/core/src/main/scala/play/api/db/slick/SlickApi.scala
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ object DefaultSlickApi {
}
}

private def registerDatabaseShutdownHook(dbConf: DatabaseConfig[_]): Unit = {
private def registerDatabaseShutdownHook(dbConf: DatabaseConfig[?]): Unit = {
// clean-up when the application is stopped.
lifecycle.addStopHook { () =>
Future {
Expand Down
6 changes: 3 additions & 3 deletions src/core/src/main/scala/play/api/db/slick/SlickModule.scala
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ object SlickModule {

@Singleton
final class SlickModule extends Module {
def bindings(environment: Environment, configuration: Configuration): Seq[Binding[_]] = {
def bindings(environment: Environment, configuration: Configuration): Seq[Binding[?]] = {
val config = configuration.underlying
val dbKey = config.getString(SlickModule.DbKeyConfig)
val default = config.getString(SlickModule.DefaultDbName)
Expand All @@ -44,11 +44,11 @@ final class SlickModule extends Module {
)
}

def namedDatabaseConfigBindings(dbs: Set[String]): Seq[Binding[_]] = dbs.toList.map { db =>
def namedDatabaseConfigBindings(dbs: Set[String]): Seq[Binding[?]] = dbs.toList.map { db =>
bindNamed(db).to(new NamedDatabaseConfigProvider(db))
}

def defaultDatabaseConfigBinding(default: String, dbs: Set[String]): Seq[Binding[_]] =
def defaultDatabaseConfigBinding(default: String, dbs: Set[String]): Seq[Binding[?]] =
if (dbs.contains(default)) Seq(bind[DatabaseConfigProvider].to(bindNamed(default))) else Nil

def bindNamed(name: String): BindingKey[DatabaseConfigProvider] =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ class DefaultSlickApiSpec extends Specification { self =>
// A new injector should be created to ensure each test is independent of each other
def injector: Injector = GuiceApplicationBuilder(configuration = TestData.configuration).injector()

def hooks(lifecycle: DefaultApplicationLifecycle): Seq[_] = {
def hooks(lifecycle: DefaultApplicationLifecycle): Seq[?] = {
val hooksField = lifecycle.getClass.getDeclaredField("hooks")
hooksField.setAccessible(true)
hooksField.get(lifecycle).asInstanceOf[ConcurrentLinkedDeque[_]].toArray().toSeq
hooksField.get(lifecycle).asInstanceOf[ConcurrentLinkedDeque[?]].toArray().toSeq
}

"DefaultSlickApi" should {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import play.api.inject.Module

@Singleton
class EvolutionsModule extends Module {
def bindings(environment: Environment, configuration: Configuration): Seq[Binding[_]] = {
def bindings(environment: Environment, configuration: Configuration): Seq[Binding[?]] = {
Seq(bind[DBApi].to[DBApiAdapter].in[Singleton])
}
}
Expand Down

0 comments on commit a990d83

Please sign in to comment.