This is an automated email from the ASF dual-hosted git repository.
hepin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-persistence-r2dbc.git
The following commit(s) were added to refs/heads/main by this push:
new 64e8710 Update scalafmt-core to 3.9.10 (#258)
64e8710 is described below
commit 64e8710a552c33b24c05f3cfe701006631974d4f
Author: scala-steward-asf[bot]
<147768647+scala-steward-asf[bot]@users.noreply.github.com>
AuthorDate: Sun Nov 2 10:03:02 2025 +0800
Update scalafmt-core to 3.9.10 (#258)
* Update scalafmt-core to 3.9.10
* Reformat with scalafmt 3.9.10
Executed command: scalafmt --non-interactive
* Add 'Reformat with scalafmt 3.9.10' to .git-blame-ignore-revs
---------
Co-authored-by: scala-steward-asf[bot]
<147768647+scala-steward-asf[bot]@users.noreply.github.com>
---
.git-blame-ignore-revs | 3 +++
.scalafmt.conf | 2 +-
.../apache/pekko/persistence/r2dbc/ConnectionFactoryProvider.scala | 4 ++--
.../main/scala/org/apache/pekko/persistence/r2dbc/R2dbcSettings.scala | 2 +-
.../org/apache/pekko/persistence/r2dbc/internal/ContinuousQuery.scala | 2 +-
.../scala/org/apache/pekko/persistence/r2dbc/journal/JournalDao.scala | 2 +-
.../org/apache/pekko/persistence/r2dbc/journal/R2dbcJournal.scala | 2 +-
.../pekko/persistence/r2dbc/query/scaladsl/R2dbcReadJournal.scala | 4 ++--
.../persistence/r2dbc/state/scaladsl/R2dbcDurableStateStore.scala | 2 +-
.../org/apache/pekko/persistence/r2dbc/migration/MigrationTool.scala | 2 +-
.../org/apache/pekko/projection/r2dbc/internal/R2dbcOffsetStore.scala | 2 +-
.../org/apache/pekko/projection/r2dbc/EventSourcedChaosSpec.scala | 4 ++--
.../scala/org/apache/pekko/projection/r2dbc/R2dbcProjectionSpec.scala | 2 +-
.../pekko/projection/r2dbc/R2dbcTimestampOffsetProjectionSpec.scala | 2 +-
.../apache/pekko/projection/r2dbc/TestSourceProviderWithInput.scala | 2 +-
15 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 0d4841b..639658d 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -9,3 +9,6 @@ a141610a37f23c8843cc34213b9813a89b850b31
# Scala Steward: Reformat with scalafmt 3.8.5
356e00197c017085fea10db78c825631f24bb1c2
+
+# Scala Steward: Reformat with scalafmt 3.9.10
+57d925f749826bf0f8bea05e8a02cbb9ddfe0821
diff --git a/.scalafmt.conf b/.scalafmt.conf
index e25ad0b..d8a4486 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.9.3
+version = 3.9.10
runner.dialect = scala213
project.git = true
style = defaultWithAlign
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/r2dbc/ConnectionFactoryProvider.scala
b/core/src/main/scala/org/apache/pekko/persistence/r2dbc/ConnectionFactoryProvider.scala
index ce3ea63..39eeee5 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/r2dbc/ConnectionFactoryProvider.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/r2dbc/ConnectionFactoryProvider.scala
@@ -109,12 +109,12 @@ class ConnectionFactoryProvider(system: ActorSystem[_])
extends Extension {
private def createConnectionFactoryOptionsCustomizer(
settings: ConnectionFactorySettings): ConnectionFactoryOptionsCustomizer
= {
settings.connectionFactoryOptionsCustomizer match {
- case None => NoopCustomizer
+ case None => NoopCustomizer
case Some(fqcn) =>
val args = List(classOf[ActorSystem[_]] -> system)
system.dynamicAccess.createInstanceFor[ConnectionFactoryOptionsCustomizer](fqcn,
args) match {
case Success(customizer) => customizer
- case Failure(cause) =>
+ case Failure(cause) =>
throw new IllegalArgumentException(s"Failed to create
ConnectionFactoryOptionsCustomizer for class $fqcn",
cause)
}
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/r2dbc/R2dbcSettings.scala
b/core/src/main/scala/org/apache/pekko/persistence/r2dbc/R2dbcSettings.scala
index 00f43b3..674e82f 100644
--- a/core/src/main/scala/org/apache/pekko/persistence/r2dbc/R2dbcSettings.scala
+++ b/core/src/main/scala/org/apache/pekko/persistence/r2dbc/R2dbcSettings.scala
@@ -47,7 +47,7 @@ object Dialect {
case "yugabyte" => Dialect.Yugabyte
case "postgres" => Dialect.Postgres
case "mysql" => Dialect.MySQL
- case other =>
+ case other =>
throw new IllegalArgumentException(
s"Unknown dialect [$other]. Supported dialects are [yugabyte,
postgres, mysql].")
}
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/r2dbc/internal/ContinuousQuery.scala
b/core/src/main/scala/org/apache/pekko/persistence/r2dbc/internal/ContinuousQuery.scala
index b51055c..dda2bc3 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/r2dbc/internal/ContinuousQuery.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/r2dbc/internal/ContinuousQuery.scala
@@ -122,7 +122,7 @@ final private[r2dbc] class ContinuousQuery[S, T](
subStreamFinished = false
beforeQuery(state) match {
- case None => runNextQuery()
+ case None => runNextQuery()
case Some(beforeQueryFuture) =>
beforeQueryFuture.onComplete(beforeQueryCallback.invoke)(ExecutionContext.parasitic)
}
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/r2dbc/journal/JournalDao.scala
b/core/src/main/scala/org/apache/pekko/persistence/r2dbc/journal/JournalDao.scala
index 1e5fcfb..801471d 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/r2dbc/journal/JournalDao.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/r2dbc/journal/JournalDao.scala
@@ -65,7 +65,7 @@ private[r2dbc] object JournalDao {
def readMetadata(row: Row): Option[SerializedEventMetadata] = {
row.get("meta_payload", classOf[Array[Byte]]) match {
- case null => None
+ case null => None
case metaPayload =>
Some(
SerializedEventMetadata(
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/r2dbc/journal/R2dbcJournal.scala
b/core/src/main/scala/org/apache/pekko/persistence/r2dbc/journal/R2dbcJournal.scala
index c2fdd35..9b79519 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/r2dbc/journal/R2dbcJournal.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/r2dbc/journal/R2dbcJournal.scala
@@ -63,7 +63,7 @@ private[r2dbc] object R2dbcJournal {
sender = ActorRef.noSender)
val reprWithMeta = row.metadata match {
- case None => repr
+ case None => repr
case Some(meta) =>
repr.withMetadata(serialization.deserialize(meta.payload, meta.serId,
meta.serManifest).get)
}
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/r2dbc/query/scaladsl/R2dbcReadJournal.scala
b/core/src/main/scala/org/apache/pekko/persistence/r2dbc/query/scaladsl/R2dbcReadJournal.scala
index f721f84..f623d4e 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/r2dbc/query/scaladsl/R2dbcReadJournal.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/r2dbc/query/scaladsl/R2dbcReadJournal.scala
@@ -245,7 +245,7 @@ final class R2dbcReadJournal(system: ExtendedActorSystem,
config: Config, cfgPat
.loadEvent(persistenceId, sequenceNr)
.map {
case Some(row) => deserializeBySliceRow(row)
- case None =>
+ case None =>
throw new NoSuchElementException(
s"Event with persistenceId [$persistenceId] and sequenceNr
[$sequenceNr] not found.")
}
@@ -334,7 +334,7 @@ final class R2dbcReadJournal(system: ExtendedActorSystem,
config: Config, cfgPat
val offset = TimestampOffset(row.dbTimestamp, row.readDbTimestamp,
Map(row.persistenceId -> row.seqNr))
val envelope = ClassicEventEnvelope(offset, row.persistenceId, row.seqNr,
event.get, row.dbTimestamp.toEpochMilli)
row.metadata match {
- case None => envelope
+ case None => envelope
case Some(meta) =>
envelope.withMetadata(serialization.deserialize(meta.payload,
meta.serId, meta.serManifest).get)
}
diff --git
a/core/src/main/scala/org/apache/pekko/persistence/r2dbc/state/scaladsl/R2dbcDurableStateStore.scala
b/core/src/main/scala/org/apache/pekko/persistence/r2dbc/state/scaladsl/R2dbcDurableStateStore.scala
index d6c43aa..c1115eb 100644
---
a/core/src/main/scala/org/apache/pekko/persistence/r2dbc/state/scaladsl/R2dbcDurableStateStore.scala
+++
b/core/src/main/scala/org/apache/pekko/persistence/r2dbc/state/scaladsl/R2dbcDurableStateStore.scala
@@ -77,7 +77,7 @@ class R2dbcDurableStateStore[A](system: ExtendedActorSystem,
config: Config, cfg
override def getObject(persistenceId: String): Future[GetObjectResult[A]] = {
implicit val ec: ExecutionContext = system.dispatcher
stateDao.readState(persistenceId).map {
- case None => GetObjectResult(None, 0L)
+ case None => GetObjectResult(None, 0L)
case Some(serializedRow) =>
val payload = serialization
.deserialize(serializedRow.payload, serializedRow.serId,
serializedRow.serManifest)
diff --git
a/migration/src/main/scala/org/apache/pekko/persistence/r2dbc/migration/MigrationTool.scala
b/migration/src/main/scala/org/apache/pekko/persistence/r2dbc/migration/MigrationTool.scala
index dddbfd3..d2bccb0 100644
---
a/migration/src/main/scala/org/apache/pekko/persistence/r2dbc/migration/MigrationTool.scala
+++
b/migration/src/main/scala/org/apache/pekko/persistence/r2dbc/migration/MigrationTool.scala
@@ -287,7 +287,7 @@ class MigrationTool(system: ActorSystem[_]) {
private def migrateSnapshot(persistenceId: String, currentProgress:
Option[CurrentProgress]): Future[Int] = {
val progressSeqNr = currentProgress.map(_.snapshotSeqNr).getOrElse(0L)
loadSourceSnapshot(persistenceId, progressSeqNr + 1).flatMap {
- case None => Future.successful(0)
+ case None =>
Future.successful(0)
case Some(selectedSnapshot @ SelectedSnapshot(snapshotMetadata, _)) =>
for {
seqNr <- {
diff --git
a/projection/src/main/scala/org/apache/pekko/projection/r2dbc/internal/R2dbcOffsetStore.scala
b/projection/src/main/scala/org/apache/pekko/projection/r2dbc/internal/R2dbcOffsetStore.scala
index e2515b7..20ae6bc 100644
---
a/projection/src/main/scala/org/apache/pekko/projection/r2dbc/internal/R2dbcOffsetStore.scala
+++
b/projection/src/main/scala/org/apache/pekko/projection/r2dbc/internal/R2dbcOffsetStore.scala
@@ -280,7 +280,7 @@ private[projection] class R2dbcOffsetStore(
private def timestampOffsetBySlicesSourceProvider: BySlicesSourceProvider =
sourceProvider match {
case Some(provider) => provider
- case None =>
+ case None =>
throw new IllegalArgumentException(
"Expected BySlicesSourceProvider to be defined when TimestampOffset
is used.")
}
diff --git
a/projection/src/test/scala/org/apache/pekko/projection/r2dbc/EventSourcedChaosSpec.scala
b/projection/src/test/scala/org/apache/pekko/projection/r2dbc/EventSourcedChaosSpec.scala
index 2e57692..d201fa5 100644
---
a/projection/src/test/scala/org/apache/pekko/projection/r2dbc/EventSourcedChaosSpec.scala
+++
b/projection/src/test/scala/org/apache/pekko/projection/r2dbc/EventSourcedChaosSpec.scala
@@ -143,7 +143,7 @@ class EventSourcedChaosSpec
def entity(i: Int): ActorRef[Persister.Command] = {
startedEntities.get(i) match {
case Some(ref) => ref
- case None =>
+ case None =>
val persistenceId = PersistenceId(entityType, s"p$i")
val ref = spawn(Persister(persistenceId), s"p$i")
startedEntities = startedEntities.updated(i, ref)
@@ -161,7 +161,7 @@ class EventSourcedChaosSpec
def startProjection(projectionIndex: Int):
ActorRef[ProjectionBehavior.Command] = {
runningProjections.get(projectionIndex) match {
case Some(ref) => ref
- case None =>
+ case None =>
val range = EventSourcedProvider.sliceRanges(system,
R2dbcReadJournal.Identifier, numberOfProjections)(
projectionIndex)
diff --git
a/projection/src/test/scala/org/apache/pekko/projection/r2dbc/R2dbcProjectionSpec.scala
b/projection/src/test/scala/org/apache/pekko/projection/r2dbc/R2dbcProjectionSpec.scala
index 90c606d..c6868f3 100644
---
a/projection/src/test/scala/org/apache/pekko/projection/r2dbc/R2dbcProjectionSpec.scala
+++
b/projection/src/test/scala/org/apache/pekko/projection/r2dbc/R2dbcProjectionSpec.scala
@@ -1176,7 +1176,7 @@ class R2dbcProjectionSpec
def handler: LifecycleHandler = _handler match {
case Some(h) => h
- case None =>
+ case None =>
handlerProbe.awaitAssert {
_handler.get
}
diff --git
a/projection/src/test/scala/org/apache/pekko/projection/r2dbc/R2dbcTimestampOffsetProjectionSpec.scala
b/projection/src/test/scala/org/apache/pekko/projection/r2dbc/R2dbcTimestampOffsetProjectionSpec.scala
index f24b88f..aaac877 100644
---
a/projection/src/test/scala/org/apache/pekko/projection/r2dbc/R2dbcTimestampOffsetProjectionSpec.scala
+++
b/projection/src/test/scala/org/apache/pekko/projection/r2dbc/R2dbcTimestampOffsetProjectionSpec.scala
@@ -124,7 +124,7 @@ object R2dbcTimestampOffsetProjectionSpec {
env.asInstanceOf[EventEnvelope[Event]]
} match {
case Some(env) => Future.successful(env)
- case None =>
+ case None =>
Future.failed(
new NoSuchElementException(
s"Event with persistenceId [$persistenceId] and sequenceNr
[$sequenceNr] not found."))
diff --git
a/projection/src/test/scala/org/apache/pekko/projection/r2dbc/TestSourceProviderWithInput.scala
b/projection/src/test/scala/org/apache/pekko/projection/r2dbc/TestSourceProviderWithInput.scala
index 2817b76..537df6b 100644
---
a/projection/src/test/scala/org/apache/pekko/projection/r2dbc/TestSourceProviderWithInput.scala
+++
b/projection/src/test/scala/org/apache/pekko/projection/r2dbc/TestSourceProviderWithInput.scala
@@ -100,7 +100,7 @@ class TestSourceProviderWithInput()(implicit val system:
ActorSystem[_])
env.asInstanceOf[EventEnvelope[Event]]
} match {
case Some(env) => Future.successful(env)
- case None =>
+ case None =>
Future.failed(
new NoSuchElementException(
s"Event with persistenceId [$persistenceId] and sequenceNr
[$sequenceNr] not found."))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
