diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index aaa9ce2a..39da5a79 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -3,3 +3,6 @@ c69b4062b3530798e43287cc75a74ade11955b53 # manual a48ac56bd5da81c39c12e6aeb67d5fa14f8f3593 + +# Scala Steward: Reformat with scalafmt 3.8.2 +b4b0df776a905013e7e5c2f24cf7340b97a41ec2 diff --git a/.scalafmt.conf b/.scalafmt.conf index d539f839..722e8842 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.1 +version = 3.8.2 runner.dialect = scala213 project.git = true style = defaultWithAlign diff --git a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/JdbcAsyncWriteJournal.scala b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/JdbcAsyncWriteJournal.scala index cbc798df..3dafed3f 100644 --- a/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/JdbcAsyncWriteJournal.scala +++ b/core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/JdbcAsyncWriteJournal.scala @@ -66,11 +66,8 @@ class JdbcAsyncWriteJournal(config: Config) extends AsyncWriteJournal { val fqcn = journalConfig.pluginConfig.dao val profile: JdbcProfile = slickDb.profile val args = Seq( - (classOf[Database], db), - (classOf[JdbcProfile], profile), - (classOf[JournalConfig], journalConfig), - (classOf[Serialization], SerializationExtension(system)), - (classOf[ExecutionContext], ec), + (classOf[Database], db), (classOf[JdbcProfile], profile), (classOf[JournalConfig], journalConfig), + (classOf[Serialization], SerializationExtension(system)), (classOf[ExecutionContext], ec), (classOf[Materializer], mat)) system.asInstanceOf[ExtendedActorSystem].dynamicAccess.createInstanceFor[JournalDao](fqcn, args) match { case Success(dao) => dao diff --git a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/scaladsl/JdbcReadJournal.scala b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/scaladsl/JdbcReadJournal.scala index 352721d7..633644eb 100644 --- a/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/scaladsl/JdbcReadJournal.scala +++ b/core/src/main/scala/org/apache/pekko/persistence/jdbc/query/scaladsl/JdbcReadJournal.scala @@ -77,11 +77,8 @@ class JdbcReadJournal(config: Config, configPath: String)(implicit val system: E val fqcn = readJournalConfig.pluginConfig.dao val profile: JdbcProfile = slickDb.profile val args = Seq( - (classOf[Database], db), - (classOf[JdbcProfile], profile), - (classOf[ReadJournalConfig], readJournalConfig), - (classOf[Serialization], SerializationExtension(system)), - (classOf[ExecutionContext], ec), + (classOf[Database], db), (classOf[JdbcProfile], profile), (classOf[ReadJournalConfig], readJournalConfig), + (classOf[Serialization], SerializationExtension(system)), (classOf[ExecutionContext], ec), (classOf[Materializer], mat)) system.dynamicAccess.createInstanceFor[ReadJournalDao](fqcn, args) match { case Success(dao) => dao diff --git a/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/JdbcSnapshotStore.scala b/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/JdbcSnapshotStore.scala index 7736c9f4..c15cc7c9 100644 --- a/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/JdbcSnapshotStore.scala +++ b/core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/JdbcSnapshotStore.scala @@ -53,11 +53,8 @@ class JdbcSnapshotStore(config: Config) extends SnapshotStore { val fqcn = snapshotConfig.pluginConfig.dao val profile: JdbcProfile = slickDb.profile val args = Seq( - (classOf[Database], db), - (classOf[JdbcProfile], profile), - (classOf[SnapshotConfig], snapshotConfig), - (classOf[Serialization], SerializationExtension(system)), - (classOf[ExecutionContext], ec), + (classOf[Database], db), (classOf[JdbcProfile], profile), (classOf[SnapshotConfig], snapshotConfig), + (classOf[Serialization], SerializationExtension(system)), (classOf[ExecutionContext], ec), (classOf[Materializer], mat)) system.asInstanceOf[ExtendedActorSystem].dynamicAccess.createInstanceFor[SnapshotDao](fqcn, args) match { case Success(dao) => dao diff --git a/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/SequenceNextValUpdater.scala b/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/SequenceNextValUpdater.scala index 52993c42..910dbf49 100644 --- a/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/SequenceNextValUpdater.scala +++ b/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/SequenceNextValUpdater.scala @@ -57,7 +57,8 @@ import slick.sql.SqlStreamingAction import profile.api._ def getSequenceNextValueExpr() = - sql"""SELECT nextval(pg_get_serial_sequence('#${durableStateTableCfg.tableName}', '#${durableStateTableCfg.columnNames.globalOffset}'))""".as[ + sql"""SELECT nextval(pg_get_serial_sequence('#${durableStateTableCfg.tableName}', '#${durableStateTableCfg + .columnNames.globalOffset}'))""".as[ String] } @@ -84,6 +85,7 @@ import slick.sql.SqlStreamingAction import profile.api._ def getSequenceNextValueExpr() = - sql"""SELECT #${durableStateTableCfg.tableName}__#${durableStateTableCfg.columnNames.globalOffset}_SEQ.nextval FROM DUAL""".as[ + sql"""SELECT #${durableStateTableCfg.tableName}__#${durableStateTableCfg.columnNames + .globalOffset}_SEQ.nextval FROM DUAL""".as[ String] } diff --git a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/QueryTestSpec.scala b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/QueryTestSpec.scala index c299fbe9..509edac1 100644 --- a/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/QueryTestSpec.scala +++ b/core/src/test/scala/org/apache/pekko/persistence/jdbc/query/QueryTestSpec.scala @@ -343,11 +343,8 @@ abstract class QueryTestSpec(config: String, configOverrides: Map[String, Config def withDao(f: JournalDao => Unit)(implicit system: ActorSystem, ec: ExecutionContext, mat: Materializer): Unit = { val fqcn: String = journalConfig.pluginConfig.dao val args: immutable.Seq[(Class[_], AnyRef)] = immutable.Seq( - (classOf[Database], db), - (classOf[JdbcProfile], profile), - (classOf[JournalConfig], journalConfig), - (classOf[Serialization], SerializationExtension(system)), - (classOf[ExecutionContext], ec), + (classOf[Database], db), (classOf[JdbcProfile], profile), (classOf[JournalConfig], journalConfig), + (classOf[Serialization], SerializationExtension(system)), (classOf[ExecutionContext], ec), (classOf[Materializer], mat)) val journalDao: JournalDao = system.asInstanceOf[ExtendedActorSystem].dynamicAccess.createInstanceFor[JournalDao](fqcn, args) match {