Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update scalafmt-core to 3.8.2 #205

Merged
merged 3 commits into from
Jun 16, 2024
Merged

Update scalafmt-core to 3.8.2 #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65eb40b
Update scalafmt-core to 3.8.2
scala-steward-asf[bot] Jun 16, 2024
b4b0df7
Reformat with scalafmt 3.8.2
scala-steward-asf[bot] Jun 16, 2024
0fe7bcd
Add 'Reformat with scalafmt 3.8.2' to .git-blame-ignore-revs
scala-steward-asf[bot] Jun 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ c69b4062b3530798e43287cc75a74ade11955b53

# manual
a48ac56bd5da81c39c12e6aeb67d5fa14f8f3593

# Scala Steward: Reformat with scalafmt 3.8.2
b4b0df776a905013e7e5c2f24cf7340b97a41ec2
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.1
version = 3.8.2
runner.dialect = scala213
project.git = true
style = defaultWithAlign
Expand Down
7 changes: 2 additions & 5 deletions core/src/main/scala/org/apache/pekko/persistence/jdbc/journal/JdbcAsyncWriteJournal.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 2 additions & 5 deletions core/src/main/scala/org/apache/pekko/persistence/jdbc/query/scaladsl/JdbcReadJournal.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 2 additions & 5 deletions core/src/main/scala/org/apache/pekko/persistence/jdbc/snapshot/JdbcSnapshotStore.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions core/src/main/scala/org/apache/pekko/persistence/jdbc/state/SequenceNextValUpdater.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}

Expand All @@ -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]
}
7 changes: 2 additions & 5 deletions core/src/test/scala/org/apache/pekko/persistence/jdbc/query/QueryTestSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down