From 609a7c5f8dfc8da1cec65a1b1bd9efc703c27898 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Tue, 25 Jan 2022 15:37:33 +0100 Subject: [PATCH] scala3: fix some doc samples that didn't compile (#31016) --- .../persistence/LambdaPersistenceDocTest.java | 3 ++ .../typed/SharedMutableStateDocSpec.scala | 6 +-- .../query/PersistenceQueryDocSpec.scala | 9 +++-- .../japi/journal/JavaJournalSpec.scala | 38 ++++++++++++++++++- .../japi/snapshot/JavaSnapshotStoreSpec.scala | 38 ++++++++++++++++++- 5 files changed, 86 insertions(+), 8 deletions(-) diff --git a/akka-docs/src/test/java/jdocs/persistence/LambdaPersistenceDocTest.java b/akka-docs/src/test/java/jdocs/persistence/LambdaPersistenceDocTest.java index 716925d67c..59a4c9e4ac 100644 --- a/akka-docs/src/test/java/jdocs/persistence/LambdaPersistenceDocTest.java +++ b/akka-docs/src/test/java/jdocs/persistence/LambdaPersistenceDocTest.java @@ -23,6 +23,9 @@ public class LambdaPersistenceDocTest { public String persistenceId(); // #persistence-id + } + + public interface PersistenceActorRecoveryMethods { // #recovery-status public boolean recoveryRunning(); diff --git a/akka-docs/src/test/scala/docs/actor/typed/SharedMutableStateDocSpec.scala b/akka-docs/src/test/scala/docs/actor/typed/SharedMutableStateDocSpec.scala index cf7db4d071..339c5c0600 100644 --- a/akka-docs/src/test/scala/docs/actor/typed/SharedMutableStateDocSpec.scala +++ b/akka-docs/src/test/scala/docs/actor/typed/SharedMutableStateDocSpec.scala @@ -77,9 +77,9 @@ class SharedMutableStateDocSpec { // use context.ask instead, turns the completion // into a message sent to self - context.ask(otherActor, Query(_)) { - case Success(result: String) => UpdateState(result) - case Failure(ex) => throw ex + context.ask[Query, String](otherActor, Query(_)) { + case Success(result) => UpdateState(result) + case Failure(ex) => throw ex } this diff --git a/akka-docs/src/test/scala/docs/persistence/query/PersistenceQueryDocSpec.scala b/akka-docs/src/test/scala/docs/persistence/query/PersistenceQueryDocSpec.scala index 8f8af6211d..5f906b2b29 100644 --- a/akka-docs/src/test/scala/docs/persistence/query/PersistenceQueryDocSpec.scala +++ b/akka-docs/src/test/scala/docs/persistence/query/PersistenceQueryDocSpec.scala @@ -36,11 +36,14 @@ object PersistenceQueryDocSpec { //#my-read-journal class MyReadJournalProvider(system: ExtendedActorSystem, config: Config) extends ReadJournalProvider { - override val scaladslReadJournal: MyScaladslReadJournal = + private val readJournal: MyScaladslReadJournal = new MyScaladslReadJournal(system, config) - override val javadslReadJournal: MyJavadslReadJournal = - new MyJavadslReadJournal(scaladslReadJournal) + override def scaladslReadJournal(): MyScaladslReadJournal = + readJournal + + override def javadslReadJournal(): MyJavadslReadJournal = + new MyJavadslReadJournal(readJournal) } class MyScaladslReadJournal(system: ExtendedActorSystem, config: Config) diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/japi/journal/JavaJournalSpec.scala b/akka-persistence-tck/src/main/scala/akka/persistence/japi/journal/JavaJournalSpec.scala index 0a3076823b..fb63a12777 100644 --- a/akka-persistence-tck/src/main/scala/akka/persistence/japi/journal/JavaJournalSpec.scala +++ b/akka-persistence-tck/src/main/scala/akka/persistence/japi/journal/JavaJournalSpec.scala @@ -5,9 +5,9 @@ package akka.persistence.japi.journal import com.typesafe.config.Config - import akka.persistence.CapabilityFlag import akka.persistence.journal.JournalSpec +import org.scalatest.{ Args, ConfigMap, Filter, Status, Suite, TestData } /** * JAVA API @@ -25,4 +25,40 @@ class JavaJournalSpec(config: Config) extends JournalSpec(config) { override protected def supportsRejectingNonSerializableObjects: CapabilityFlag = CapabilityFlag.on() override protected def supportsSerialization: CapabilityFlag = CapabilityFlag.on() + + override def runTests(testName: Option[String], args: Args): Status = + super.runTests(testName, args) + + override def runTest(testName: String, args: Args): Status = + super.runTest(testName, args) + + override def run(testName: Option[String], args: Args): Status = + super.run(testName, args) + + override def testDataFor(testName: String, theConfigMap: ConfigMap): TestData = + super.testDataFor(testName, theConfigMap) + + override def testNames: Set[String] = + super.testNames + + override def tags: Map[String, Set[String]] = + super.tags + + override def rerunner: Option[String] = + super.rerunner + + override def expectedTestCount(filter: Filter): Int = + super.expectedTestCount(filter) + + override def suiteId: String = + super.suiteId + + override def suiteName: String = + super.suiteName + + override def runNestedSuites(args: Args): Status = + super.runNestedSuites(args) + + override def nestedSuites: IndexedSeq[Suite] = + super.nestedSuites } diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/japi/snapshot/JavaSnapshotStoreSpec.scala b/akka-persistence-tck/src/main/scala/akka/persistence/japi/snapshot/JavaSnapshotStoreSpec.scala index 9b99b7adf1..1c6fd1dff7 100644 --- a/akka-persistence-tck/src/main/scala/akka/persistence/japi/snapshot/JavaSnapshotStoreSpec.scala +++ b/akka-persistence-tck/src/main/scala/akka/persistence/japi/snapshot/JavaSnapshotStoreSpec.scala @@ -5,9 +5,9 @@ package akka.persistence.japi.snapshot import com.typesafe.config.Config - import akka.persistence.CapabilityFlag import akka.persistence.snapshot.SnapshotStoreSpec +import org.scalatest.{ Args, ConfigMap, Filter, Status, Suite, TestData } /** * JAVA API @@ -22,4 +22,40 @@ import akka.persistence.snapshot.SnapshotStoreSpec */ class JavaSnapshotStoreSpec(config: Config) extends SnapshotStoreSpec(config) { override protected def supportsSerialization: CapabilityFlag = CapabilityFlag.on() + + override def runTests(testName: Option[String], args: Args): Status = + super.runTests(testName, args) + + override def runTest(testName: String, args: Args): Status = + super.runTest(testName, args) + + override def run(testName: Option[String], args: Args): Status = + super.run(testName, args) + + override def testDataFor(testName: String, theConfigMap: ConfigMap): TestData = + super.testDataFor(testName, theConfigMap) + + override def testNames: Set[String] = + super.testNames + + override def tags: Map[String, Set[String]] = + super.tags + + override def rerunner: Option[String] = + super.rerunner + + override def expectedTestCount(filter: Filter): Int = + super.expectedTestCount(filter) + + override def suiteId: String = + super.suiteId + + override def suiteName: String = + super.suiteName + + override def runNestedSuites(args: Args): Status = + super.runNestedSuites(args) + + override def nestedSuites: IndexedSeq[Suite] = + super.nestedSuites }