You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by md...@apache.org on 2022/11/14 20:34:13 UTC
[incubator-pekko-persistence-jdbc] 03/03: format source with scalafmt, #3
This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-persistence-jdbc.git
commit c69b4062b3530798e43287cc75a74ade11955b53
Author: Auto Format <nobody>
AuthorDate: Mon Nov 14 21:19:10 2022 +0100
format source with scalafmt, #3
---
build.sbt | 4 ++--
core/src/main/scala/akka/persistence/jdbc/AkkaSerialization.scala | 1 -
core/src/main/scala/akka/persistence/jdbc/db/SlickExtension.scala | 2 +-
.../akka/persistence/jdbc/journal/JdbcAsyncWriteJournal.scala | 2 +-
.../scala/akka/persistence/jdbc/journal/dao/JournalQueries.scala | 2 +-
.../akka/persistence/jdbc/snapshot/dao/DefaultSnapshotDao.scala | 8 ++++----
.../main/scala/akka/persistence/jdbc/util/InputStreamOps.scala | 2 +-
.../akka/persistence/jdbc/query/EventsByPersistenceIdTest.scala | 1 -
.../test/scala/akka/persistence/jdbc/query/EventsByTagTest.scala | 1 -
.../test/scala/akka/persistence/jdbc/query/QueryTestSpec.scala | 6 ++----
10 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/build.sbt b/build.sbt
index ea632df..e6635bc 100644
--- a/build.sbt
+++ b/build.sbt
@@ -44,7 +44,7 @@ lazy val docs = project
makeSite := makeSite.dependsOn(LocalRootProject / ScalaUnidoc / doc).value,
previewPath := (Paradox / siteSubdirName).value,
Preprocess / siteSubdirName := s"api/akka-persistence-jdbc/${if (isSnapshot.value) "snapshot"
- else version.value}",
+ else version.value}",
Preprocess / sourceDirectory := (LocalRootProject / ScalaUnidoc / unidoc / target).value,
Paradox / siteSubdirName := s"docs/akka-persistence-jdbc/${if (isSnapshot.value) "snapshot" else version.value}",
Compile / paradoxProperties ++= Map(
@@ -54,7 +54,7 @@ lazy val docs = project
"akka.version" -> Dependencies.AkkaVersion,
"slick.version" -> Dependencies.SlickVersion,
"extref.github.base_url" -> s"https://github.com/akka/akka-persistence-jdbc/blob/${if (isSnapshot.value) "master"
- else "v" + version.value}/%s",
+ else "v" + version.value}/%s",
// Slick
"extref.slick.base_url" -> s"https://scala-slick.org/doc/${Dependencies.SlickVersion}/%s",
// Akka
diff --git a/core/src/main/scala/akka/persistence/jdbc/AkkaSerialization.scala b/core/src/main/scala/akka/persistence/jdbc/AkkaSerialization.scala
index 2030999..c327042 100644
--- a/core/src/main/scala/akka/persistence/jdbc/AkkaSerialization.scala
+++ b/core/src/main/scala/akka/persistence/jdbc/AkkaSerialization.scala
@@ -31,7 +31,6 @@ object AkkaSerialization {
def fromRow(serialization: Serialization)(row: JournalAkkaSerializationRow): Try[(PersistentRepr, Long)] = {
serialization.deserialize(row.eventPayload, row.eventSerId, row.eventSerManifest).flatMap { payload =>
-
val metadata = for {
mPayload <- row.metaPayload
mSerId <- row.metaSerId
diff --git a/core/src/main/scala/akka/persistence/jdbc/db/SlickExtension.scala b/core/src/main/scala/akka/persistence/jdbc/db/SlickExtension.scala
index 3581542..8127228 100644
--- a/core/src/main/scala/akka/persistence/jdbc/db/SlickExtension.scala
+++ b/core/src/main/scala/akka/persistence/jdbc/db/SlickExtension.scala
@@ -66,7 +66,7 @@ class DefaultSlickDatabaseProvider(system: ActorSystem) extends SlickDatabasePro
case (key, notAnObject) =>
throw new RuntimeException(
s"""Expected "akka-persistence-jdbc.shared-databases.$key" to be a config ConfigObject, but got ${notAnObject
- .valueType()} (${notAnObject.getClass})""")
+ .valueType()} (${notAnObject.getClass})""")
}
.toMap
diff --git a/core/src/main/scala/akka/persistence/jdbc/journal/JdbcAsyncWriteJournal.scala b/core/src/main/scala/akka/persistence/jdbc/journal/JdbcAsyncWriteJournal.scala
index 4f844f3..c0441a7 100644
--- a/core/src/main/scala/akka/persistence/jdbc/journal/JdbcAsyncWriteJournal.scala
+++ b/core/src/main/scala/akka/persistence/jdbc/journal/JdbcAsyncWriteJournal.scala
@@ -73,7 +73,7 @@ class JdbcAsyncWriteJournal(config: Config) extends AsyncWriteJournal {
case upgraded: JournalDaoWithUpdates => upgraded
case _ =>
throw new IllegalStateException(s"The ${journalDao.getClass} does NOT implement [JournalDaoWithUpdates], " +
- s"which is required to perform updates of events! Please configure a valid update capable DAO (e.g. the default [ByteArrayJournalDao].")
+ s"which is required to perform updates of events! Please configure a valid update capable DAO (e.g. the default [ByteArrayJournalDao].")
}
// readHighestSequence must be performed after pending write for a persistenceId
diff --git a/core/src/main/scala/akka/persistence/jdbc/journal/dao/JournalQueries.scala b/core/src/main/scala/akka/persistence/jdbc/journal/dao/JournalQueries.scala
index 892fbd8..4335692 100644
--- a/core/src/main/scala/akka/persistence/jdbc/journal/dao/JournalQueries.scala
+++ b/core/src/main/scala/akka/persistence/jdbc/journal/dao/JournalQueries.scala
@@ -24,7 +24,7 @@ class JournalQueries(
private val TagTableC = Compiled(TagTable)
def writeJournalRows(xs: Seq[(JournalAkkaSerializationRow, Set[String])])(implicit ec: ExecutionContext) = {
- val sorted = xs.sortBy((event => event._1.sequenceNumber))
+ val sorted = xs.sortBy(event => event._1.sequenceNumber)
if (sorted.exists(_._2.nonEmpty)) {
// only if there are any tags
val (events, tags) = sorted.unzip
diff --git a/core/src/main/scala/akka/persistence/jdbc/snapshot/dao/DefaultSnapshotDao.scala b/core/src/main/scala/akka/persistence/jdbc/snapshot/dao/DefaultSnapshotDao.scala
index 502b41c..600bd58 100644
--- a/core/src/main/scala/akka/persistence/jdbc/snapshot/dao/DefaultSnapshotDao.scala
+++ b/core/src/main/scala/akka/persistence/jdbc/snapshot/dao/DefaultSnapshotDao.scala
@@ -105,15 +105,15 @@ class DefaultSnapshotDao(
.map(_ => ())(ExecutionContexts.parasitic)
override def deleteAllSnapshots(persistenceId: String): Future[Unit] =
- db.run(queries.selectAll(persistenceId).delete).map(_ => ())((ExecutionContexts.parasitic))
+ db.run(queries.selectAll(persistenceId).delete).map(_ => ())(ExecutionContexts.parasitic)
override def deleteUpToMaxSequenceNr(persistenceId: String, maxSequenceNr: Long): Future[Unit] =
db.run(queries.selectByPersistenceIdUpToMaxSequenceNr((persistenceId, maxSequenceNr)).delete)
- .map(_ => ())((ExecutionContexts.parasitic))
+ .map(_ => ())(ExecutionContexts.parasitic)
override def deleteUpToMaxTimestamp(persistenceId: String, maxTimestamp: Long): Future[Unit] =
db.run(queries.selectByPersistenceIdUpToMaxTimestamp((persistenceId, maxTimestamp)).delete)
- .map(_ => ())((ExecutionContexts.parasitic))
+ .map(_ => ())(ExecutionContexts.parasitic)
override def deleteUpToMaxSequenceNrAndMaxTimestamp(
persistenceId: String,
@@ -123,5 +123,5 @@ class DefaultSnapshotDao(
queries
.selectByPersistenceIdUpToMaxSequenceNrAndMaxTimestamp((persistenceId, maxSequenceNr, maxTimestamp))
.delete)
- .map(_ => ())((ExecutionContexts.parasitic))
+ .map(_ => ())(ExecutionContexts.parasitic)
}
diff --git a/core/src/main/scala/akka/persistence/jdbc/util/InputStreamOps.scala b/core/src/main/scala/akka/persistence/jdbc/util/InputStreamOps.scala
index b38a37a..03a708d 100644
--- a/core/src/main/scala/akka/persistence/jdbc/util/InputStreamOps.scala
+++ b/core/src/main/scala/akka/persistence/jdbc/util/InputStreamOps.scala
@@ -19,7 +19,7 @@ object InputStreamOps {
* - https://stackoverflow.com/users/2619133/oliverkn
*/
val bos: ByteArrayOutputStream = new ByteArrayOutputStream
- val buffer: Array[Byte] = new Array[Byte](0xffff)
+ val buffer: Array[Byte] = new Array[Byte](0xFFFF)
var len: Int = is.read(buffer)
while (len != -1) {
bos.write(buffer, 0, len)
diff --git a/core/src/test/scala/akka/persistence/jdbc/query/EventsByPersistenceIdTest.scala b/core/src/test/scala/akka/persistence/jdbc/query/EventsByPersistenceIdTest.scala
index fa7043a..3d63437 100644
--- a/core/src/test/scala/akka/persistence/jdbc/query/EventsByPersistenceIdTest.scala
+++ b/core/src/test/scala/akka/persistence/jdbc/query/EventsByPersistenceIdTest.scala
@@ -173,7 +173,6 @@ abstract class EventsByPersistenceIdTest(config: String) extends QueryTestSpec(c
val journalOps = new ScalaJdbcReadJournalOperations(system)
val testStartTime = System.currentTimeMillis()
withTestActors(replyToMessages = true) { (actor1, actor2, actor3) =>
-
(actor1 ? withTags(1, "number")).futureValue
(actor2 ? withTags(2, "number")).futureValue
(actor3 ? withTags(3, "number")).futureValue
diff --git a/core/src/test/scala/akka/persistence/jdbc/query/EventsByTagTest.scala b/core/src/test/scala/akka/persistence/jdbc/query/EventsByTagTest.scala
index 239e3f6..0c14055 100644
--- a/core/src/test/scala/akka/persistence/jdbc/query/EventsByTagTest.scala
+++ b/core/src/test/scala/akka/persistence/jdbc/query/EventsByTagTest.scala
@@ -127,7 +127,6 @@ abstract class EventsByTagTest(config: String) extends QueryTestSpec(config, con
val testStartTime = System.currentTimeMillis()
val journalOps = new ScalaJdbcReadJournalOperations(system)
withTestActors(replyToMessages = true) { (actor1, actor2, actor3) =>
-
(actor1 ? withTags(1, "number")).futureValue
(actor2 ? withTags(2, "number")).futureValue
(actor3 ? withTags(3, "number")).futureValue
diff --git a/core/src/test/scala/akka/persistence/jdbc/query/QueryTestSpec.scala b/core/src/test/scala/akka/persistence/jdbc/query/QueryTestSpec.scala
index 307b86c..42ccf9e 100644
--- a/core/src/test/scala/akka/persistence/jdbc/query/QueryTestSpec.scala
+++ b/core/src/test/scala/akka/persistence/jdbc/query/QueryTestSpec.scala
@@ -287,10 +287,8 @@ abstract class QueryTestSpec(config: String, configOverrides: Map[String, Config
}
def pendingIfOracleWithLegacy(): Unit = {
- if (
- profile == slick.jdbc.OracleProfile && readJournalConfig.pluginConfig.dao == classOf[
- akka.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao].getName
- )
+ if (profile == slick.jdbc.OracleProfile && readJournalConfig.pluginConfig.dao == classOf[
+ akka.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao].getName)
pending // TODO https://github.com/akka/akka-persistence-jdbc/issues/673
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org