diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/PersistenceQuery.scala b/akka-persistence-query/src/main/scala/akka/persistence/query/PersistenceQuery.scala index 172d389fc5..1808ce89cf 100644 --- a/akka-persistence-query/src/main/scala/akka/persistence/query/PersistenceQuery.scala +++ b/akka-persistence-query/src/main/scala/akka/persistence/query/PersistenceQuery.scala @@ -8,6 +8,7 @@ import akka.actor._ import akka.annotation.InternalApi import akka.persistence.query.scaladsl.ReadJournal import akka.persistence.{ PersistencePlugin, PluginProvider } +import akka.util.unused import com.typesafe.config.{ Config, ConfigFactory } import scala.reflect.ClassTag @@ -63,7 +64,7 @@ class PersistenceQuery(system: ExtendedActorSystem) * read journal configuration entry. */ final def getReadJournalFor[T <: javadsl.ReadJournal]( - clazz: Class[T], + @unused clazz: Class[T], readJournalPluginId: String, readJournalPluginConfig: Config): T = pluginFor(readJournalPluginId, readJournalPluginConfig).javadslPlugin.asInstanceOf[T] diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsPublisher.scala b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsPublisher.scala index 60217cf262..67652cb0c2 100644 --- a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsPublisher.scala +++ b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsPublisher.scala @@ -13,6 +13,7 @@ import akka.persistence.journal.leveldb.LeveldbJournal import akka.stream.actor.ActorPublisher import akka.stream.actor.ActorPublisherMessage.Cancel import akka.stream.actor.ActorPublisherMessage.Request +import com.github.ghik.silencer.silent /** * INTERNAL API @@ -28,6 +29,7 @@ private[akka] object AllPersistenceIdsPublisher { * INTERNAL API */ // FIXME needs a be rewritten as a GraphStage (since 2.5.0) +@silent // Re-write as part of https://github.com/akka/akka/issues/26187 private[akka] class AllPersistenceIdsPublisher(liveQuery: Boolean, maxBufSize: Int, writeJournalPluginId: String) extends ActorPublisher[String] with DeliveryBuffer[String] diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/DeliveryBuffer.scala b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/DeliveryBuffer.scala index 1497795915..a0095552d7 100644 --- a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/DeliveryBuffer.scala +++ b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/DeliveryBuffer.scala @@ -5,10 +5,12 @@ package akka.persistence.query.journal.leveldb import akka.stream.actor.ActorPublisher +import com.github.ghik.silencer.silent /** * INTERNAL API */ +@silent // FIXME Re-write as part of https://github.com/akka/akka/issues/26187 private[akka] trait DeliveryBuffer[T] { _: ActorPublisher[T] => var buf = Vector.empty[T] diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdPublisher.scala b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdPublisher.scala index 115f6d1467..de4cfca0d5 100644 --- a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdPublisher.scala +++ b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdPublisher.scala @@ -13,6 +13,7 @@ import akka.stream.actor.ActorPublisherMessage.Cancel import akka.stream.actor.ActorPublisherMessage.Request import akka.persistence.journal.leveldb.LeveldbJournal import akka.persistence.query.{ EventEnvelope, Sequence } +import com.github.ghik.silencer.silent /** * INTERNAL API @@ -55,7 +56,7 @@ private[akka] object EventsByPersistenceIdPublisher { /** * INTERNAL API */ -// FIXME needs a be rewritten as a GraphStage (since 2.5.0) +@silent // FIXME Re-write as part of https://github.com/akka/akka/issues/26187 private[akka] abstract class AbstractEventsByPersistenceIdPublisher( val persistenceId: String, val fromSequenceNr: Long, diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByTagPublisher.scala b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByTagPublisher.scala index a5193d23bc..3a79430d7b 100644 --- a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByTagPublisher.scala +++ b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByTagPublisher.scala @@ -15,6 +15,7 @@ import akka.persistence.journal.leveldb.LeveldbJournal import akka.persistence.query.{ EventEnvelope, Sequence } import akka.persistence.journal.leveldb.LeveldbJournal.ReplayTaggedMessages import akka.persistence.journal.leveldb.LeveldbJournal.ReplayedTaggedMessage +import com.github.ghik.silencer.silent /** * INTERNAL API @@ -44,7 +45,7 @@ private[akka] object EventsByTagPublisher { /** * INTERNAL API */ -// FIXME needs a be rewritten as a GraphStage +@silent // FIXME Re-write as part of https://github.com/akka/akka/issues/26187 private[akka] abstract class AbstractEventsByTagPublisher( val tag: String, val fromOffset: Long, diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala index 921688e22d..94808bf88f 100644 --- a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala +++ b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala @@ -17,7 +17,8 @@ import akka.persistence.query.journal.leveldb.{ import akka.persistence.query.scaladsl.{ ReadJournal, _ } import akka.persistence.query.{ EventEnvelope, NoOffset, Offset, Sequence } import akka.stream.scaladsl.Source -import akka.util.ByteString +import akka.util.{ unused, ByteString } +import com.github.ghik.silencer.silent import com.typesafe.config.Config import scala.concurrent.duration._ @@ -36,7 +37,8 @@ import scala.concurrent.duration._ * absolute path corresponding to the identifier, which is `"akka.persistence.query.journal.leveldb"` * for the default [[LeveldbReadJournal#Identifier]]. See `reference.conf`. */ -class LeveldbReadJournal(system: ExtendedActorSystem, config: Config) +@silent // FIXME Re-write as part of https://github.com/akka/akka/issues/26187 +class LeveldbReadJournal(@unused system: ExtendedActorSystem, config: Config) extends ReadJournal with PersistenceIdsQuery with CurrentPersistenceIdsQuery diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/DummyReadJournal.scala b/akka-persistence-query/src/test/scala/akka/persistence/query/DummyReadJournal.scala index 9ffcfacf5f..e09800edc8 100644 --- a/akka-persistence-query/src/test/scala/akka/persistence/query/DummyReadJournal.scala +++ b/akka-persistence-query/src/test/scala/akka/persistence/query/DummyReadJournal.scala @@ -8,6 +8,7 @@ import akka.NotUsed import akka.stream.scaladsl.Source import com.typesafe.config.{ Config, ConfigFactory } import akka.actor.ExtendedActorSystem +import akka.util.unused /** * Use for tests only! @@ -61,13 +62,13 @@ class DummyReadJournalProvider(dummyValue: String) extends ReadJournalProvider { new DummyReadJournalForJava(scaladslReadJournal) } -class DummyReadJournalProvider2(sys: ExtendedActorSystem) extends DummyReadJournalProvider +class DummyReadJournalProvider2(@unused sys: ExtendedActorSystem) extends DummyReadJournalProvider -class DummyReadJournalProvider3(sys: ExtendedActorSystem, conf: Config) extends DummyReadJournalProvider +class DummyReadJournalProvider3(@unused sys: ExtendedActorSystem, @unused conf: Config) extends DummyReadJournalProvider -class DummyReadJournalProvider4(sys: ExtendedActorSystem, conf: Config, confPath: String) +class DummyReadJournalProvider4(@unused sys: ExtendedActorSystem, @unused conf: Config, @unused confPath: String) extends DummyReadJournalProvider -class DummyReadJournalProvider5(sys: ExtendedActorSystem) extends DummyReadJournalProvider +class DummyReadJournalProvider5(@unused sys: ExtendedActorSystem) extends DummyReadJournalProvider -class CustomDummyReadJournalProvider5(sys: ExtendedActorSystem) extends DummyReadJournalProvider("custom") +class CustomDummyReadJournalProvider5(@unused sys: ExtendedActorSystem) extends DummyReadJournalProvider("custom") diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdSpec.scala b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdSpec.scala index 1a2ca49c23..45de75c2af 100644 --- a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdSpec.scala +++ b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdSpec.scala @@ -53,7 +53,7 @@ class EventsByPersistenceIdSpec extends AkkaSpec(EventsByPersistenceIdSpec.confi } "find existing events" in { - val ref = setup("a") + setup("a") val src = queries.currentEventsByPersistenceId("a", 0L, Long.MaxValue) src @@ -68,7 +68,7 @@ class EventsByPersistenceIdSpec extends AkkaSpec(EventsByPersistenceIdSpec.confi } "find existing events up to a sequence number" in { - val ref = setup("b") + setup("b") val src = queries.currentEventsByPersistenceId("b", 0L, 2L) src.map(_.event).runWith(TestSink.probe[Any]).request(5).expectNext("b-1", "b-2").expectComplete() } @@ -116,28 +116,28 @@ class EventsByPersistenceIdSpec extends AkkaSpec(EventsByPersistenceIdSpec.confi } "return empty stream for empty journal" in { - val ref = setupEmpty("i") + setupEmpty("i") val src = queries.currentEventsByPersistenceId("i", 0L, Long.MaxValue) src.map(_.event).runWith(TestSink.probe[Any]).request(1).expectComplete() } "return empty stream for journal from 0 to 0" in { - val ref = setup("k1") + setup("k1") val src = queries.currentEventsByPersistenceId("k1", 0L, 0L) src.map(_.event).runWith(TestSink.probe[Any]).request(1).expectComplete() } "return empty stream for empty journal from 0 to 0" in { - val ref = setupEmpty("k2") + setupEmpty("k2") val src = queries.currentEventsByPersistenceId("k2", 0L, 0L) src.map(_.event).runWith(TestSink.probe[Any]).request(1).expectComplete() } "return empty stream for journal from seqNo greater than highestSeqNo" in { - val ref = setup("l") + setup("l") val src = queries.currentEventsByPersistenceId("l", 4L, 3L) src.map(_.event).runWith(TestSink.probe[Any]).request(1).expectComplete() diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByTagSpec.scala b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByTagSpec.scala index f17e68c361..6aa9a00021 100644 --- a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByTagSpec.scala +++ b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByTagSpec.scala @@ -39,7 +39,7 @@ class ColorTagger extends WriteEventAdapter { val colors = Set("green", "black", "blue") override def toJournal(event: Any): Any = event match { case s: String => - var tags = colors.foldLeft(Set.empty[String])((acc, c) => if (s.contains(c)) acc + c else acc) + val tags = colors.foldLeft(Set.empty[String])((acc, c) => if (s.contains(c)) acc + c else acc) if (tags.isEmpty) event else Tagged(event, tags) case _ => event @@ -115,7 +115,7 @@ class EventsByTagSpec extends AkkaSpec(EventsByTagSpec.config) with Cleanup with "find events from offset (exclusive)" in { val greenSrc = queries.currentEventsByTag(tag = "green", offset = Sequence(2L)) - val probe = greenSrc + greenSrc .runWith(TestSink.probe[Any]) .request(10) // note that banana is not included, since exclusive offset @@ -150,7 +150,7 @@ class EventsByTagSpec extends AkkaSpec(EventsByTagSpec.config) with Cleanup with "find events from offset (exclusive)" in { val greenSrc = queries.eventsByTag(tag = "green", offset = Sequence(2L)) - val probe = greenSrc + greenSrc .runWith(TestSink.probe[Any]) .request(10) // note that banana is not included, since exclusive offset diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/TestActor.scala b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/TestActor.scala index 161bf49c86..91a8440570 100644 --- a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/TestActor.scala +++ b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/TestActor.scala @@ -19,7 +19,7 @@ class TestActor(override val persistenceId: String) extends PersistentActor { import TestActor.DeleteCmd val receiveRecover: Receive = { - case evt: String => + case _: String => } val receiveCommand: Receive = { diff --git a/project/AkkaDisciplinePlugin.scala b/project/AkkaDisciplinePlugin.scala index 71f5074646..056359b0a6 100644 --- a/project/AkkaDisciplinePlugin.scala +++ b/project/AkkaDisciplinePlugin.scala @@ -34,13 +34,11 @@ object AkkaDisciplinePlugin extends AutoPlugin with ScalafixSupport { "akka-multi-node-testkit", "akka-persistence-tck", "akka-persistence-typed", - "akka-persistence-query", "akka-remote", "akka-stream-testkit", "akka-stream-tests", "akka-stream-tests-tck", - "akka-testkit" - ) + "akka-testkit") val strictProjects = Set("akka-discovery", "akka-protobuf", "akka-coordination")