diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala index 8669904d43..863dbc3cba 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala @@ -167,7 +167,7 @@ private[akka] final class TestProbeImpl[M](name: String, system: ActorSystem[_]) override def expectNoMessage(): Unit = expectNoMessage_internal(settings.ExpectNoMessageDefaultTimeout.dilated) - private def expectNoMessage_internal(max: FiniteDuration) { + private def expectNoMessage_internal(max: FiniteDuration): Unit = { val o = receiveOne(max) assert(o == null, s"received unexpected message $o") lastWasNoMessage = true diff --git a/akka-actor-tests/src/test/scala/akka/AkkaExceptionSpec.scala b/akka-actor-tests/src/test/scala/akka/AkkaExceptionSpec.scala index ee24835b72..8f76c8d869 100644 --- a/akka-actor-tests/src/test/scala/akka/AkkaExceptionSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/AkkaExceptionSpec.scala @@ -26,7 +26,7 @@ class AkkaExceptionSpec extends WordSpec with Matchers { } } - def verify(clazz: java.lang.Class[_]) { + def verify(clazz: java.lang.Class[_]): Unit = { clazz.getConstructor(Array(classOf[String]): _*) } } diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala index de88e30727..bd57a73f82 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala @@ -37,7 +37,7 @@ object ActorConfigurationVerificationSpec { class ActorConfigurationVerificationSpec extends AkkaSpec(ActorConfigurationVerificationSpec.config) with DefaultTimeout with BeforeAndAfterEach { import ActorConfigurationVerificationSpec._ - override def atStartup { + override def atStartup: Unit = { system.eventStream.publish(Mute(EventFilter[ConfigurationException](""))) } diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorCreationPerfSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorCreationPerfSpec.scala index 57d04bb03c..310120ebcd 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorCreationPerfSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorCreationPerfSpec.scala @@ -133,7 +133,7 @@ class ActorCreationPerfSpec extends AkkaSpec(ActorCreationPerfSpec.config) with override val reportMetricsEnabled = metricsConfig.getBoolean("akka.test.actor.ActorPerfSpec.report-metrics") override val forceGcEnabled = metricsConfig.getBoolean("akka.test.actor.ActorPerfSpec.force-gc") - def runWithCounterInside(metricName: String, scenarioName: String, number: Int, propsCreator: () ⇒ Props) { + def runWithCounterInside(metricName: String, scenarioName: String, number: Int, propsCreator: () ⇒ Props): Unit = { val hist = histogram(BlockingTimeKey / metricName) val driver = system.actorOf(Props(classOf[TimingDriver], hist), scenarioName) @@ -178,7 +178,7 @@ class ActorCreationPerfSpec extends AkkaSpec(ActorCreationPerfSpec.config) with after diff before } - def registerTests(name: String, propsCreator: () ⇒ Props) { + def registerTests(name: String, propsCreator: () ⇒ Props): Unit = { val scenarioName = name.replaceAll("""[^\w]""", "") s"warm-up before: $name" taggedAs PerformanceTest in { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala index 79eafa3f7f..550dc4ee30 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala @@ -22,8 +22,8 @@ object ActorLifeCycleSpec { def report(msg: Any) = testActor ! message(msg) def message(msg: Any): Tuple3[Any, String, Int] = (msg, id, currentGen) val currentGen = generationProvider.getAndIncrement() - override def preStart() { report("preStart") } - override def postStop() { report("postStop") } + override def preStart(): Unit = { report("preStart") } + override def postStop(): Unit = { report("postStop") } def receive = { case "status" ⇒ sender() ! message("OK") } } @@ -40,8 +40,8 @@ class ActorLifeCycleSpec extends AkkaSpec("akka.actor.serialize-messages=off") w val supervisor = system.actorOf(Props(classOf[Supervisor], OneForOneStrategy(maxNrOfRetries = 3)(List(classOf[Exception])))) val gen = new AtomicInteger(0) val restarterProps = Props(new LifeCycleTestActor(testActor, id, gen) { - override def preRestart(reason: Throwable, message: Option[Any]) { report("preRestart") } - override def postRestart(reason: Throwable) { report("postRestart") } + override def preRestart(reason: Throwable, message: Option[Any]): Unit = { report("preRestart") } + override def postRestart(reason: Throwable): Unit = { report("postRestart") } }).withDeploy(Deploy.local) val restarter = Await.result((supervisor ? restarterProps).mapTo[ActorRef], timeout.duration) @@ -119,7 +119,7 @@ class ActorLifeCycleSpec extends AkkaSpec("akka.actor.serialize-messages=off") w "log failues in postStop" in { val a = system.actorOf(Props(new Actor { def receive = Actor.emptyBehavior - override def postStop { throw new Exception("hurrah") } + override def postStop: Unit = { throw new Exception("hurrah") } })) EventFilter[Exception]("hurrah", occurrences = 1) intercept { a ! PoisonPill diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala index e3fc524c84..a1761b4878 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala @@ -175,7 +175,7 @@ class ActorLookupSpec extends AkkaSpec with DefaultTimeout { val all = Seq(c1, c2, c21) "find actors by looking up their path" in { - def check(looker: ActorRef, pathOf: ActorRef, result: ActorRef) { + def check(looker: ActorRef, pathOf: ActorRef, result: ActorRef): Unit = { Await.result(looker ? LookupPath(pathOf.path), timeout.duration) should ===(result) } for { @@ -185,7 +185,7 @@ class ActorLookupSpec extends AkkaSpec with DefaultTimeout { } "find actors by looking up their string representation" in { - def check(looker: ActorRef, pathOf: ActorRef, result: ActorRef) { + def check(looker: ActorRef, pathOf: ActorRef, result: ActorRef): Unit = { Await.result(looker ? LookupString(pathOf.path.toString), timeout.duration) should ===(result) // with uid Await.result(looker ? LookupString(pathOf.path.toSerializationFormat), timeout.duration) should ===(result) @@ -199,7 +199,7 @@ class ActorLookupSpec extends AkkaSpec with DefaultTimeout { } "find actors by looking up their root-anchored relative path" in { - def check(looker: ActorRef, pathOf: ActorRef, result: ActorRef) { + def check(looker: ActorRef, pathOf: ActorRef, result: ActorRef): Unit = { Await.result(looker ? LookupString(pathOf.path.toStringWithoutAddress), timeout.duration) should ===(result) Await.result(looker ? LookupString(pathOf.path.elements.mkString("/", "/", "/")), timeout.duration) should ===(result) } @@ -210,7 +210,7 @@ class ActorLookupSpec extends AkkaSpec with DefaultTimeout { } "find actors by looking up their relative path" in { - def check(looker: ActorRef, result: ActorRef, elems: String*) { + def check(looker: ActorRef, result: ActorRef, elems: String*): Unit = { Await.result(looker ? LookupElems(elems), timeout.duration) should ===(result) Await.result(looker ? LookupString(elems mkString "/"), timeout.duration) should ===(result) Await.result(looker ? LookupString(elems mkString ("", "/", "/")), timeout.duration) should ===(result) @@ -226,7 +226,7 @@ class ActorLookupSpec extends AkkaSpec with DefaultTimeout { } "find system-generated actors" in { - def check(target: ActorRef) { + def check(target: ActorRef): Unit = { for (looker ← all) { Await.result(looker ? LookupPath(target.path), timeout.duration) should ===(target) Await.result(looker ? LookupString(target.path.toString), timeout.duration) should ===(target) @@ -241,12 +241,12 @@ class ActorLookupSpec extends AkkaSpec with DefaultTimeout { "return deadLetters or EmptyLocalActorRef, respectively, for non-existing paths" in { import scala.collection.JavaConverters._ - def checkOne(looker: ActorRef, query: Query, result: ActorRef) { + def checkOne(looker: ActorRef, query: Query, result: ActorRef): Unit = { val lookup = Await.result(looker ? query, timeout.duration) lookup.getClass should be(result.getClass) lookup should ===(result) } - def check(looker: ActorRef) { + def check(looker: ActorRef): Unit = { val lookname = looker.path.elements.mkString("", "/", "/") for ( (l, r) ← Seq( diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala index 83fc1b0dd5..4775e30358 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala @@ -184,7 +184,7 @@ class ActorSelectionSpec extends AkkaSpec with DefaultTimeout { val all = Seq(c1, c2, c21) "select actors by their path" in { - def check(looker: ActorRef, pathOf: ActorRef, result: ActorRef) { + def check(looker: ActorRef, pathOf: ActorRef, result: ActorRef): Unit = { askNode(looker, SelectPath(pathOf.path)) should ===(Some(result)) } for { @@ -194,7 +194,7 @@ class ActorSelectionSpec extends AkkaSpec with DefaultTimeout { } "select actors by their string path representation" in { - def check(looker: ActorRef, pathOf: ActorRef, result: ActorRef) { + def check(looker: ActorRef, pathOf: ActorRef, result: ActorRef): Unit = { askNode(looker, SelectString(pathOf.path.toStringWithoutAddress)) should ===(Some(result)) // with trailing / askNode(looker, SelectString(pathOf.path.toStringWithoutAddress + "/")) should ===(Some(result)) @@ -206,7 +206,7 @@ class ActorSelectionSpec extends AkkaSpec with DefaultTimeout { } "select actors by their root-anchored relative path" in { - def check(looker: ActorRef, pathOf: ActorRef, result: ActorRef) { + def check(looker: ActorRef, pathOf: ActorRef, result: ActorRef): Unit = { askNode(looker, SelectString(pathOf.path.toStringWithoutAddress)) should ===(Some(result)) askNode(looker, SelectString(pathOf.path.elements.mkString("/", "/", "/"))) should ===(Some(result)) } @@ -217,7 +217,7 @@ class ActorSelectionSpec extends AkkaSpec with DefaultTimeout { } "select actors by their relative path" in { - def check(looker: ActorRef, result: ActorRef, elems: String*) { + def check(looker: ActorRef, result: ActorRef, elems: String*): Unit = { askNode(looker, SelectString(elems mkString "/")) should ===(Some(result)) askNode(looker, SelectString(elems mkString ("", "/", "/"))) should ===(Some(result)) } @@ -232,7 +232,7 @@ class ActorSelectionSpec extends AkkaSpec with DefaultTimeout { } "find system-generated actors" in { - def check(target: ActorRef) { + def check(target: ActorRef): Unit = { for (looker ← all) { askNode(looker, SelectPath(target.path)) should ===(Some(target)) askNode(looker, SelectString(target.path.toString)) should ===(Some(target)) @@ -247,11 +247,11 @@ class ActorSelectionSpec extends AkkaSpec with DefaultTimeout { "return deadLetters or ActorIdentity(None), respectively, for non-existing paths" in { import scala.collection.JavaConverters._ - def checkOne(looker: ActorRef, query: Query, result: Option[ActorRef]) { + def checkOne(looker: ActorRef, query: Query, result: Option[ActorRef]): Unit = { val lookup = askNode(looker, query) lookup should ===(result) } - def check(looker: ActorRef) { + def check(looker: ActorRef): Unit = { val lookname = looker.path.elements.mkString("", "/", "/") for ( (l, r) ← Seq( diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala index 219fa268ed..cddbd3aede 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala @@ -42,7 +42,7 @@ object ActorSystemSpec { } } - override def preRestart(cause: Throwable, msg: Option[Any]) { + override def preRestart(cause: Throwable, msg: Option[Any]): Unit = { if (master ne null) { master ! "failed with " + cause + " while processing " + msg } diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala index 67c0591ee5..c6fb7227b6 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala @@ -105,7 +105,7 @@ class JavaActorWithStashSpec extends StashJavaAPI with JUnitSuiteLike class ActorWithStashSpec extends AkkaSpec(ActorWithStashSpec.testConf) with DefaultTimeout with BeforeAndAfterEach { import ActorWithStashSpec._ - override def atStartup { + override def atStartup: Unit = { system.eventStream.publish(Mute(EventFilter[Exception]("Crashing..."))) } diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala index 3c6b95b049..9cb1ff5c9e 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala @@ -235,7 +235,7 @@ class FSMActorSpec extends AkkaSpec(Map("akka.actor.debug.fsm" → true)) with I } }) - def checkTimersActive(active: Boolean) { + def checkTimersActive(active: Boolean): Unit = { for (timer ← timerNames) fsmref.isTimerActive(timer) should ===(active) fsmref.isStateTimerActive should ===(active) } diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala index d0f0078be9..5738840255 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala @@ -39,7 +39,7 @@ object FSMTransitionSpec { case Event("reply", _) ⇒ stay replying "reply" } initialize() - override def preRestart(reason: Throwable, msg: Option[Any]) { target ! "restarted" } + override def preRestart(reason: Throwable, msg: Option[Any]): Unit = { target ! "restarted" } } class OtherFSM(target: ActorRef) extends Actor with FSM[Int, Int] { diff --git a/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala index 90a77e9ed6..662bec03ee 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala @@ -18,7 +18,7 @@ import akka.pattern.ask class RestartStrategySpec extends AkkaSpec("akka.actor.serialize-messages = off") with DefaultTimeout { - override def atStartup { + override def atStartup: Unit = { system.eventStream.publish(Mute(EventFilter[Exception]("Crashing..."))) } diff --git a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala index 44c3506d4d..6dd7165b41 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala @@ -531,15 +531,15 @@ class LightArrayRevolverSchedulerSpec extends AkkaSpec(SchedulerSpec.testConfRev trait Driver { def wakeUp(d: FiniteDuration): Unit def expectWait(): FiniteDuration - def expectWait(d: FiniteDuration) { expectWait() should ===(d) } + def expectWait(d: FiniteDuration): Unit = { expectWait() should ===(d) } def probe: TestProbe def step: FiniteDuration def close(): Unit } val localEC = new ExecutionContext { - def execute(runnable: Runnable) { runnable.run() } - def reportFailure(t: Throwable) { t.printStackTrace() } + def execute(runnable: Runnable): Unit = { runnable.run() } + def reportFailure(t: Throwable): Unit = { t.printStackTrace() } } def withScheduler(start: Long = 0L, _startTick: Int = 0, config: Config = ConfigFactory.empty)(thunk: (Scheduler with Closeable, Driver) ⇒ Unit): Unit = { diff --git a/akka-actor-tests/src/test/scala/akka/actor/Supervisor.scala b/akka-actor-tests/src/test/scala/akka/actor/Supervisor.scala index d1fc88837b..36faeb51a5 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/Supervisor.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/Supervisor.scala @@ -14,5 +14,5 @@ class Supervisor(override val supervisorStrategy: SupervisorStrategy) extends Ac case x: Props ⇒ sender() ! context.actorOf(x) } // need to override the default of stopping all children upon restart, tests rely on keeping them around - override def preRestart(cause: Throwable, msg: Option[Any]) {} + override def preRestart(cause: Throwable, msg: Option[Any]): Unit = {} } diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala index 9a8282025f..598b8506f0 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala @@ -41,7 +41,7 @@ object SupervisorHierarchySpec { case p: Props ⇒ sender() ! context.actorOf(p) } // test relies on keeping children around during restart - override def preRestart(cause: Throwable, msg: Option[Any]) {} + override def preRestart(cause: Throwable, msg: Option[Any]): Unit = {} override def postRestart(reason: Throwable) = { countDown.countDown() } @@ -135,7 +135,7 @@ object SupervisorHierarchySpec { var failed = false var suspended = false - def abort(msg: String) { + def abort(msg: String): Unit = { listener ! ErrorLog(msg, log) log = Vector(Event("log sent", identityHashCode(this))) context.parent ! Abort @@ -150,7 +150,7 @@ object SupervisorHierarchySpec { def suspendCount = context.asInstanceOf[ActorCell].mailbox.suspendCount - override def preStart { + override def preStart: Unit = { log :+= Event("started", identityHashCode(this)) listener ! Ready(self) val s = size - 1 // subtract myself @@ -221,7 +221,7 @@ object SupervisorHierarchySpec { Resume }) - override def postRestart(cause: Throwable) { + override def postRestart(cause: Throwable): Unit = { val state = stateCache.get(self.path) log = state.log log :+= Event("restarted " + suspendCount + " " + cause, identityHashCode(this)) @@ -244,7 +244,7 @@ object SupervisorHierarchySpec { } } - override def postStop { + override def postStop: Unit = { if (failed || suspended) { listener ! ErrorLog("not resumed (" + failed + ", " + suspended + ")", log) val state = stateCache.get(self) @@ -433,15 +433,15 @@ object SupervisorHierarchySpec { var hierarchy: ActorRef = _ - override def preRestart(cause: Throwable, msg: Option[Any]) { + override def preRestart(cause: Throwable, msg: Option[Any]): Unit = { throw ActorKilledException("I want to DIE") } - override def postRestart(cause: Throwable) { + override def postRestart(cause: Throwable): Unit = { throw ActorKilledException("I said I wanted to DIE, dammit!") } - override def postStop { + override def postStop: Unit = { testActor ! "stressTestStopped" } diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala index ffba990701..dcfc8a131c 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala @@ -39,7 +39,7 @@ class SupervisorMiscSpec extends AkkaSpec(SupervisorMiscSpec.config) with Defaul OneForOneStrategy(maxNrOfRetries = 3, withinTimeRange = 5 seconds)(List(classOf[Exception]))))) val workerProps = Props(new Actor { - override def postRestart(cause: Throwable) { countDownLatch.countDown() } + override def postRestart(cause: Throwable): Unit = { countDownLatch.countDown() } def receive = { case "status" ⇒ this.sender() ! "OK" case _ ⇒ this.context.stop(self) diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala index e0dec53fcb..eb235a5f2c 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala @@ -51,7 +51,7 @@ object SupervisorSpec { throw e } - override def postRestart(reason: Throwable) { + override def postRestart(reason: Throwable): Unit = { sendTo ! reason.getMessage } } @@ -164,7 +164,7 @@ class SupervisorSpec extends AkkaSpec(SupervisorSpec.config) with BeforeAndAfter (pingpong1, pingpong2, pingpong3, topSupervisor) } - override def atStartup() { + override def atStartup(): Unit = { system.eventStream.publish(Mute(EventFilter[RuntimeException](ExceptionMessage))) } @@ -206,10 +206,10 @@ class SupervisorSpec extends AkkaSpec(SupervisorSpec.config) with BeforeAndAfter var postRestarts = 0 var preStarts = 0 var postStops = 0 - override def preRestart(reason: Throwable, message: Option[Any]) { preRestarts += 1; testActor ! ("preRestart" + preRestarts) } - override def postRestart(reason: Throwable) { postRestarts += 1; testActor ! ("postRestart" + postRestarts) } - override def preStart() { preStarts += 1; testActor ! ("preStart" + preStarts) } - override def postStop() { postStops += 1; testActor ! ("postStop" + postStops) } + override def preRestart(reason: Throwable, message: Option[Any]): Unit = { preRestarts += 1; testActor ! ("preRestart" + preRestarts) } + override def postRestart(reason: Throwable): Unit = { postRestarts += 1; testActor ! ("postRestart" + postRestarts) } + override def preStart(): Unit = { preStarts += 1; testActor ! ("preStart" + preStarts) } + override def postStop(): Unit = { postStops += 1; testActor ! ("postStop" + postStops) } def receive = { case "crash" ⇒ { testActor ! "crashed"; throw new RuntimeException("Expected") } case "ping" ⇒ sender() ! "pong" @@ -384,7 +384,7 @@ class SupervisorSpec extends AkkaSpec(SupervisorSpec.config) with BeforeAndAfter val init = inits.getAndIncrement() if (init % 3 == 1) throw new IllegalStateException("Don't wanna!") - override def preRestart(cause: Throwable, msg: Option[Any]) { + override def preRestart(cause: Throwable, msg: Option[Any]): Unit = { if (init % 3 == 0) throw new IllegalStateException("Don't wanna!") } diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala index c7ec6c3d29..948d124146 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala @@ -23,7 +23,7 @@ class SupervisorTreeSpec extends AkkaSpec("akka.actor.serialize-messages = off") def receive = { case p: Props ⇒ sender() ! context.actorOf(p) } - override def preRestart(cause: Throwable, msg: Option[Any]) { testActor ! self.path } + override def preRestart(cause: Throwable, msg: Option[Any]): Unit = { testActor ! self.path } }) val headActor = system.actorOf(p) val middleActor = Await.result((headActor ? p).mapTo[ActorRef], timeout.duration) diff --git a/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala b/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala index ff6530939e..951beec430 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala @@ -19,7 +19,7 @@ class Ticket669Spec extends AkkaSpec with BeforeAndAfterAll with ImplicitSender import Ticket669Spec._ // TODO: does this really make sense? - override def atStartup() { + override def atStartup(): Unit = { Thread.interrupted() //remove interrupted status. } @@ -56,11 +56,11 @@ object Ticket669Spec { case msg ⇒ throw new Exception("test") } - override def preRestart(reason: scala.Throwable, msg: Option[Any]) { + override def preRestart(reason: scala.Throwable, msg: Option[Any]): Unit = { sender() ! "failure1" } - override def postStop() { + override def postStop(): Unit = { sender() ! "failure2" } } diff --git a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala index 031496b029..14017f0c80 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala @@ -103,7 +103,7 @@ object TypedActorSpec { def nullReturn(): Any = null - def incr() + def incr(): Unit @throws(classOf[TimeoutException]) def read(): Int @@ -148,7 +148,7 @@ object TypedActorSpec { var internalNumber = 0 - def incr() { + def incr(): Unit = { internalNumber += 1 } diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala index 10ffc35bcc..d07d67ba3f 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala @@ -75,7 +75,7 @@ object ActorModelSpec { } } - override def postRestart(reason: Throwable) { + override def postRestart(reason: Throwable): Unit = { interceptor.getStats(self).restarts.incrementAndGet() } @@ -128,40 +128,40 @@ object ActorModelSpec { } - protected[akka] abstract override def suspend(actor: ActorCell) { + protected[akka] abstract override def suspend(actor: ActorCell): Unit = { getStats(actor.self).suspensions.incrementAndGet() super.suspend(actor) } - protected[akka] abstract override def resume(actor: ActorCell) { + protected[akka] abstract override def resume(actor: ActorCell): Unit = { super.resume(actor) getStats(actor.self).resumes.incrementAndGet() } - protected[akka] abstract override def register(actor: ActorCell) { + protected[akka] abstract override def register(actor: ActorCell): Unit = { assert(getStats(actor.self).registers.incrementAndGet() == 1) super.register(actor) } - protected[akka] abstract override def unregister(actor: ActorCell) { + protected[akka] abstract override def unregister(actor: ActorCell): Unit = { assert(getStats(actor.self).unregisters.incrementAndGet() == 1) super.unregister(actor) } - protected[akka] abstract override def dispatch(receiver: ActorCell, invocation: Envelope) { + protected[akka] abstract override def dispatch(receiver: ActorCell, invocation: Envelope): Unit = { val stats = getStats(receiver.self) stats.msgsReceived.incrementAndGet() super.dispatch(receiver, invocation) } - protected[akka] abstract override def shutdown() { + protected[akka] abstract override def shutdown(): Unit = { stops.incrementAndGet() super.shutdown() } } def assertDispatcher(dispatcher: MessageDispatcherInterceptor)( - stops: Long = dispatcher.stops.get())(implicit system: ActorSystem) { + stops: Long = dispatcher.stops.get())(implicit system: ActorSystem): Unit = { val deadline = System.currentTimeMillis + dispatcher.shutdownTimeout.toMillis * 5 try { await(deadline)(stops == dispatcher.stops.get) @@ -173,12 +173,12 @@ object ActorModelSpec { } } - def assertCountDown(latch: CountDownLatch, wait: Long, hint: String) { + def assertCountDown(latch: CountDownLatch, wait: Long, hint: String): Unit = { if (!latch.await(wait, TimeUnit.MILLISECONDS)) fail("Failed to count down within " + wait + " millis (count at " + latch.getCount + "). " + hint) } - def assertNoCountDown(latch: CountDownLatch, wait: Long, hint: String) { + def assertNoCountDown(latch: CountDownLatch, wait: Long, hint: String): Unit = { if (latch.await(wait, TimeUnit.MILLISECONDS)) fail("Expected count down to fail after " + wait + " millis. " + hint) } @@ -193,7 +193,7 @@ object ActorModelSpec { unregisters: Long = 0, msgsReceived: Long = 0, msgsProcessed: Long = 0, - restarts: Long = 0)(implicit system: ActorSystem) { + restarts: Long = 0)(implicit system: ActorSystem): Unit = { assertRef(actorRef, dispatcher)( suspensions, resumes, @@ -211,7 +211,7 @@ object ActorModelSpec { unregisters: Long = statsFor(actorRef, dispatcher).unregisters.get(), msgsReceived: Long = statsFor(actorRef, dispatcher).msgsReceived.get(), msgsProcessed: Long = statsFor(actorRef, dispatcher).msgsProcessed.get(), - restarts: Long = statsFor(actorRef, dispatcher).restarts.get())(implicit system: ActorSystem) { + restarts: Long = statsFor(actorRef, dispatcher).restarts.get())(implicit system: ActorSystem): Unit = { val stats = statsFor(actorRef, Option(dispatcher).getOrElse(actorRef.asInstanceOf[ActorRefWithCell].underlying.asInstanceOf[ActorCell].dispatcher)) val deadline = System.currentTimeMillis + 1000 try { @@ -334,7 +334,7 @@ abstract class ActorModelSpec(config: String) extends AkkaSpec(config) with Defa system.stop(a) } - def spawn(f: ⇒ Unit) { + def spawn(f: ⇒ Unit): Unit = { (new Thread { override def run(): Unit = try f catch { @@ -367,7 +367,7 @@ abstract class ActorModelSpec(config: String) extends AkkaSpec(config) with Defa val dispatcher = interceptedDispatcher() val props = Props[DispatcherActor].withDispatcher(dispatcher.id) - def flood(num: Int) { + def flood(num: Int): Unit = { val cachedMessage = CountDownNStop(new CountDownLatch(num)) val stopLatch = new CountDownLatch(num) val keepAliveLatch = new CountDownLatch(1) diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala index 97cade30df..8011a86bfc 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala @@ -213,8 +213,8 @@ class ExecutionContextSpec extends AkkaSpec with DefaultTimeout { val submissions = new AtomicInteger(0) val counter = new AtomicInteger(0) val underlying = new ExecutionContext { - override def execute(r: Runnable) { submissions.incrementAndGet(); ExecutionContext.global.execute(r) } - override def reportFailure(t: Throwable) { ExecutionContext.global.reportFailure(t) } + override def execute(r: Runnable): Unit = { submissions.incrementAndGet(); ExecutionContext.global.execute(r) } + override def reportFailure(t: Throwable): Unit = { ExecutionContext.global.reportFailure(t) } } val throughput = 25 val sec = SerializedSuspendableExecutionContext(throughput)(underlying) @@ -245,8 +245,8 @@ class ExecutionContextSpec extends AkkaSpec with DefaultTimeout { val submissions = new AtomicInteger(0) val counter = new AtomicInteger(0) val underlying = new ExecutionContext { - override def execute(r: Runnable) { submissions.incrementAndGet(); ExecutionContext.global.execute(r) } - override def reportFailure(t: Throwable) { ExecutionContext.global.reportFailure(t) } + override def execute(r: Runnable): Unit = { submissions.incrementAndGet(); ExecutionContext.global.execute(r) } + override def reportFailure(t: Throwable): Unit = { ExecutionContext.global.reportFailure(t) } } val throughput = 25 val sec = SerializedSuspendableExecutionContext(throughput)(underlying) diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala index 280bddebfd..be97714eee 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala @@ -92,7 +92,7 @@ abstract class MailboxSpec extends AkkaSpec with BeforeAndAfterAll with BeforeAn q.hasMessages should ===(expected != 0) } - def ensureSingleConsumerEnqueueDequeue(config: MailboxType) { + def ensureSingleConsumerEnqueueDequeue(config: MailboxType): Unit = { val q = factory(config) ensureMailboxSize(q, 0) q.dequeue should ===(null) @@ -112,7 +112,7 @@ abstract class MailboxSpec extends AkkaSpec with BeforeAndAfterAll with BeforeAn ensureMailboxSize(q, 0) } - def ensureInitialMailboxState(config: MailboxType, q: MessageQueue) { + def ensureInitialMailboxState(config: MailboxType, q: MessageQueue): Unit = { q should not be null q match { case aQueue: BlockingQueue[_] ⇒ diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala index ef5c2b3ed9..7f29d1922a 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala @@ -48,7 +48,7 @@ class PriorityDispatcherSpec extends AkkaSpec(PriorityDispatcherSpec.config) wit } } - def testOrdering(dispatcherKey: String) { + def testOrdering(dispatcherKey: String): Unit = { val msgs = (1 to 100) toList // It's important that the actor under test is not a top level actor diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala index 67b00003a3..b96c2833b1 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala @@ -51,7 +51,7 @@ class StablePriorityDispatcherSpec extends AkkaSpec(StablePriorityDispatcherSpec testOrdering(dispatcherKey) } - def testOrdering(dispatcherKey: String) { + def testOrdering(dispatcherKey: String): Unit = { val msgs = (1 to 200) toList val shuffled = scala.util.Random.shuffle(msgs) diff --git a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala b/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala index 4266b424bf..0aab50f534 100644 --- a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala @@ -258,7 +258,7 @@ class ActorEventBusSpec(conf: Config) extends EventBusSpec("ActorEventBus", conf disposeSubscriber(system, a2) } - private def expectUnsubscribedByUnsubscriber(p: TestProbe, a: ActorRef) { + private def expectUnsubscribedByUnsubscriber(p: TestProbe, a: ActorRef): Unit = { val expectedMsg = s"actor $a has terminated, unsubscribing it from $bus" p.fishForMessage(1 second, hint = expectedMsg) { case Logging.Debug(_, _, msg) if msg equals expectedMsg ⇒ true @@ -266,7 +266,7 @@ class ActorEventBusSpec(conf: Config) extends EventBusSpec("ActorEventBus", conf } } - private def expectUnregisterFromUnsubscriber(p: TestProbe, a: ActorRef) { + private def expectUnregisterFromUnsubscriber(p: TestProbe, a: ActorRef): Unit = { val expectedMsg = s"unregistered watch of $a in $bus" p.fishForMessage(1 second, hint = expectedMsg) { case Logging.Debug(_, _, msg) if msg equals expectedMsg ⇒ true diff --git a/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala b/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala index d234da13e8..3ea33de987 100644 --- a/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala @@ -406,7 +406,7 @@ class EventStreamSpec extends AkkaSpec(EventStreamSpec.config) { } - private def verifyLevel(bus: LoggingBus, level: Logging.LogLevel) { + private def verifyLevel(bus: LoggingBus, level: Logging.LogLevel): Unit = { import Logging._ val allmsg = Seq(Debug("", null, "debug"), Info("", null, "info"), Warning("", null, "warning"), Error("", null, "error")) val msg = allmsg filter (_.level <= level) @@ -414,7 +414,7 @@ class EventStreamSpec extends AkkaSpec(EventStreamSpec.config) { msg foreach (expectMsg(_)) } - private def fishForDebugMessage(a: TestProbe, messagePrefix: String, max: Duration = 3 seconds) { + private def fishForDebugMessage(a: TestProbe, messagePrefix: String, max: Duration = 3 seconds): Unit = { a.fishForMessage(max, hint = "expected debug message prefix: " + messagePrefix) { case Logging.Debug(_, _, msg: String) if msg startsWith messagePrefix ⇒ true case other ⇒ false diff --git a/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala b/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala index 46ba0c9465..0876b29bc1 100644 --- a/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala @@ -43,13 +43,13 @@ class LoggingReceiveSpec extends WordSpec with BeforeAndAfterAll { appAuto.eventStream.publish(filter) appLifecycle.eventStream.publish(filter) - def ignoreMute(t: TestKit) { + def ignoreMute(t: TestKit): Unit = { t.ignoreMsg { case (_: TestEvent.Mute | _: TestEvent.UnMute) ⇒ true } } - override def afterAll() { + override def afterAll(): Unit = { TestKit.shutdownActorSystem(appLogging) TestKit.shutdownActorSystem(appAuto) TestKit.shutdownActorSystem(appLifecycle) diff --git a/akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala b/akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala index 1d336f9c5f..084bc07cea 100644 --- a/akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala @@ -36,12 +36,12 @@ class JavaLoggerSpec extends AkkaSpec(JavaLoggerSpec.config) { val logger = logging.Logger.getLogger(classOf[JavaLoggerSpec.LogProducer].getName) logger.setUseParentHandlers(false) // turn off output of test LogRecords logger.addHandler(new logging.Handler { - def publish(record: logging.LogRecord) { + def publish(record: logging.LogRecord): Unit = { testActor ! record } - def flush() {} - def close() {} + def flush(): Unit = {} + def close(): Unit = {} }) val producer = system.actorOf(Props[JavaLoggerSpec.LogProducer], name = "log") diff --git a/akka-actor-tests/src/test/scala/akka/io/TcpListenerSpec.scala b/akka-actor-tests/src/test/scala/akka/io/TcpListenerSpec.scala index a0db7f9df6..fc22472ae4 100644 --- a/akka-actor-tests/src/test/scala/akka/io/TcpListenerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/TcpListenerSpec.scala @@ -145,7 +145,7 @@ class TcpListenerSpec extends AkkaSpec(""" registerCallReceiver.expectMsg(if (pullMode) 0 else OP_ACCEPT) - def bindListener() { + def bindListener(): Unit = { listener ! new ChannelRegistration { def enableInterest(op: Int): Unit = interestCallReceiver.ref ! op def disableInterest(op: Int): Unit = interestCallReceiver.ref ! -op diff --git a/akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala index b2258784d9..577b88f243 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala @@ -24,7 +24,7 @@ class RandomSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { case "hello" ⇒ sender() ! "world" } - override def postStop() { + override def postStop(): Unit = { stopLatch.countDown() } })), "random-shutdown") @@ -88,7 +88,7 @@ class RandomSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { case "hello" ⇒ helloLatch.countDown() } - override def postStop() { + override def postStop(): Unit = { stopLatch.countDown() } })), "random-broadcast") diff --git a/akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala index ad73d19032..c1603fd28c 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala @@ -31,7 +31,7 @@ class RoundRobinSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { case "hello" ⇒ helloLatch.countDown() } - override def postStop() { + override def postStop(): Unit = { stopLatch.countDown() } })), "round-robin-shutdown") @@ -85,7 +85,7 @@ class RoundRobinSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { case "hello" ⇒ helloLatch.countDown() } - override def postStop() { + override def postStop(): Unit = { stopLatch.countDown() } })), "round-robin-broadcast") diff --git a/akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala index e7251b3b62..76daac1371 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala @@ -31,13 +31,13 @@ object TailChoppingSpec { class TailChoppingSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { import TailChoppingSpec._ - def oneOfShouldEqual(what: Any, default: Any, ref: ActorRef*)(f: ActorRef ⇒ Any) { + def oneOfShouldEqual(what: Any, default: Any, ref: ActorRef*)(f: ActorRef ⇒ Any): Unit = { val results = ref.map(p ⇒ f(p)) results.count(_ == what) should equal(1) results.count(_ == default) should equal(results.size - 1) } - def allShouldEqual(what: Any, ref: ActorRef*)(f: ActorRef ⇒ Any) { + def allShouldEqual(what: Any, ref: ActorRef*)(f: ActorRef ⇒ Any): Unit = { val results = ref.map(p ⇒ f(p)) results.count(_ == what) should equal(results.size) } diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/receptionist/ReceptionistApiSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/receptionist/ReceptionistApiSpec.scala index 98d0c4a21f..6ec01113d5 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/receptionist/ReceptionistApiSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/receptionist/ReceptionistApiSpec.scala @@ -15,7 +15,7 @@ import scala.util.Success object ReceptionistApiSpec { - def compileOnlySpec() { + def compileOnlySpec(): Unit = { // some dummy prerequisites implicit val timeout: Timeout = 3.seconds val service: ActorRef[String] = ??? diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala index 62361ea02e..2498587947 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala @@ -410,7 +410,7 @@ private[akka] object LocalActorRefProvider { } // guardian MUST NOT lose its children during restart - override def preRestart(cause: Throwable, msg: Option[Any]) {} + override def preRestart(cause: Throwable, msg: Option[Any]): Unit = {} } /** @@ -457,7 +457,7 @@ private[akka] object LocalActorRefProvider { } // guardian MUST NOT lose its children during restart - override def preRestart(cause: Throwable, msg: Option[Any]) {} + override def preRestart(cause: Throwable, msg: Option[Any]): Unit = {} } } @@ -653,7 +653,7 @@ private[akka] class LocalActorRefProvider private[akka] ( tempContainer.removeChild(path.name) } - private[akka] def init(_system: ActorSystemImpl) { + private[akka] def init(_system: ActorSystemImpl): Unit = { system = _system rootGuardian.start() // chain death watchers so that killing guardian stops the application diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala index 73c236fc30..24fb366e9e 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala @@ -854,8 +854,8 @@ private[akka] class ActorSystemImpl( } def start(): this.type = _start - def registerOnTermination[T](code: ⇒ T) { registerOnTermination(new Runnable { def run = code }) } - def registerOnTermination(code: Runnable) { terminationCallbacks.add(code) } + def registerOnTermination[T](code: ⇒ T): Unit = { registerOnTermination(new Runnable { def run = code }) } + def registerOnTermination(code: Runnable): Unit = { terminationCallbacks.add(code) } override def terminate(): Future[Terminated] = { if (!settings.LogDeadLettersDuringShutdown) logDeadLetterListener foreach stop @@ -950,7 +950,7 @@ private[akka] class ActorSystemImpl( def hasExtension(ext: ExtensionId[_ <: Extension]): Boolean = findExtension(ext) != null - private def loadExtensions() { + private def loadExtensions(): Unit = { /** * @param throwOnLoadFail Throw exception when an extension fails to load (needed for backwards compatibility) */ diff --git a/akka-actor/src/main/scala/akka/actor/FSM.scala b/akka-actor/src/main/scala/akka/actor/FSM.scala index c34914fb76..a49a555da8 100644 --- a/akka-actor/src/main/scala/akka/actor/FSM.scala +++ b/akka-actor/src/main/scala/akka/actor/FSM.scala @@ -510,7 +510,7 @@ trait FSM[S, D] extends Actor with Listeners with ActorLogging { implicit final def total2pf(transitionHandler: (S, S) ⇒ Unit): TransitionHandler = new TransitionHandler { def isDefinedAt(in: (S, S)) = true - def apply(in: (S, S)) { transitionHandler(in._1, in._2) } + def apply(in: (S, S)): Unit = { transitionHandler(in._1, in._2) } } /** @@ -622,7 +622,7 @@ trait FSM[S, D] extends Actor with Listeners with ActorLogging { * transition handling */ private var transitionEvent: List[TransitionHandler] = Nil - private def handleTransition(prev: S, next: S) { + private def handleTransition(prev: S, next: S): Unit = { val tuple = (prev, next) for (te ← transitionEvent) { if (te.isDefinedAt(tuple)) te(tuple) } } @@ -789,7 +789,7 @@ trait LoggingFSM[S, D] extends FSM[S, D] { this: Actor ⇒ private var pos = 0 private var full = false - private def advance() { + private def advance(): Unit = { val n = pos + 1 if (n == logDepth) { full = true diff --git a/akka-actor/src/main/scala/akka/actor/dsl/Inbox.scala b/akka-actor/src/main/scala/akka/actor/dsl/Inbox.scala index 093fed3d64..4ee7b34ac2 100644 --- a/akka-actor/src/main/scala/akka/actor/dsl/Inbox.scala +++ b/akka-actor/src/main/scala/akka/actor/dsl/Inbox.scala @@ -65,13 +65,13 @@ trait Inbox { this: ActorDSL.type ⇒ var clientsByTimeout = TreeSet.empty[Query] var printedWarning = false - def enqueueQuery(q: Query) { + def enqueueQuery(q: Query): Unit = { val query = q withClient sender() clients enqueue query clientsByTimeout += query } - def enqueueMessage(msg: Any) { + def enqueueMessage(msg: Any): Unit = { if (messages.size < size) messages enqueue msg else { if (!printedWarning) { @@ -215,7 +215,7 @@ trait Inbox { this: ActorDSL.type ⇒ * Overridden finalizer which will try to stop the actor once this Inbox * is no longer referenced. */ - override def finalize() { + override def finalize(): Unit = { system.stop(receiver) } } diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala b/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala index d9c7220ce8..d09d31f3ee 100644 --- a/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala +++ b/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala @@ -139,7 +139,7 @@ private[akka] trait FaultHandling { this: ActorCell ⇒ } } - protected def terminate() { + protected def terminate(): Unit = { setReceiveTimeout(Duration.Undefined) cancelReceiveTimeout @@ -200,7 +200,7 @@ private[akka] trait FaultHandling { this: ActorCell ⇒ } } - private def finishTerminate() { + private def finishTerminate(): Unit = { val a = actor /* The following order is crucial for things to work properly. Only change this if you're very confident and lucky. * diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala b/akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala index be9bed96c1..dd1ee9c219 100644 --- a/akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala +++ b/akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala @@ -24,7 +24,7 @@ private[akka] trait ReceiveTimeout { this: ActorCell ⇒ final def setReceiveTimeout(timeout: Duration): Unit = receiveTimeoutData = receiveTimeoutData.copy(_1 = timeout) - final def checkReceiveTimeout() { + final def checkReceiveTimeout(): Unit = { val recvtimeout = receiveTimeoutData recvtimeout._1 match { case f: FiniteDuration ⇒ diff --git a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala index c537103f3d..913f5dcd23 100644 --- a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala +++ b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala @@ -192,7 +192,7 @@ abstract class MessageDispatcher(val configurator: MessageDispatcherConfigurator * * INTERNAL API */ - protected[akka] def register(actor: ActorCell) { + protected[akka] def register(actor: ActorCell): Unit = { if (debug) actors.put(this, actor.self) addInhabitants(+1) } @@ -202,7 +202,7 @@ abstract class MessageDispatcher(val configurator: MessageDispatcherConfigurator * * INTERNAL API */ - protected[akka] def unregister(actor: ActorCell) { + protected[akka] def unregister(actor: ActorCell): Unit = { if (debug) actors.remove(this, actor.self) addInhabitants(-1) val mailBox = actor.swapMailbox(mailboxes.deadLetterMailbox) @@ -212,7 +212,7 @@ abstract class MessageDispatcher(val configurator: MessageDispatcherConfigurator private val shutdownAction = new Runnable { @tailrec - final def run() { + final def run(): Unit = { shutdownSchedule match { case SCHEDULED ⇒ try { @@ -260,14 +260,14 @@ abstract class MessageDispatcher(val configurator: MessageDispatcherConfigurator * * INTERNAL API */ - protected[akka] def systemDispatch(receiver: ActorCell, invocation: SystemMessage) + protected[akka] def systemDispatch(receiver: ActorCell, invocation: SystemMessage): Unit /** * Will be called when the dispatcher is to queue an invocation for execution * * INTERNAL API */ - protected[akka] def dispatch(receiver: ActorCell, invocation: Envelope) + protected[akka] def dispatch(receiver: ActorCell, invocation: Envelope): Unit /** * Suggest to register the provided mailbox for execution @@ -295,7 +295,7 @@ abstract class MessageDispatcher(val configurator: MessageDispatcherConfigurator /** * INTERNAL API */ - protected[akka] def executeTask(invocation: TaskInvocation) + protected[akka] def executeTask(invocation: TaskInvocation): Unit /** * Called one time every time an actor is detached from this dispatcher and this dispatcher has no actors left attached diff --git a/akka-actor/src/main/scala/akka/dispatch/CachingConfig.scala b/akka-actor/src/main/scala/akka/dispatch/CachingConfig.scala index d5223e0bce..7b8d8ca2d0 100644 --- a/akka-actor/src/main/scala/akka/dispatch/CachingConfig.scala +++ b/akka-actor/src/main/scala/akka/dispatch/CachingConfig.scala @@ -73,7 +73,7 @@ private[akka] class CachingConfig(_config: Config) extends Config { case e ⇒ e } - def checkValid(reference: Config, restrictToPaths: String*) { + def checkValid(reference: Config, restrictToPaths: String*): Unit = { config.checkValid(reference, restrictToPaths: _*) } diff --git a/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala index a23aad42fa..649a39f49f 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala @@ -67,7 +67,7 @@ class Dispatcher( /** * INTERNAL API */ - protected[akka] def executeTask(invocation: TaskInvocation) { + protected[akka] def executeTask(invocation: TaskInvocation): Unit = { try { executorService execute invocation } catch { diff --git a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala index 86d7cab9cd..b4ba2cf685 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala @@ -271,7 +271,7 @@ private[akka] abstract class Mailbox(val messageQueue: MessageQueue) * becomes closed (because of processing a Terminate message), dump all * already dequeued message to deadLetters. */ - final def processAllSystemMessages() { + final def processAllSystemMessages(): Unit = { var interruption: Throwable = null var messageList = systemDrain(SystemMessageList.LNil) while ((messageList.nonEmpty) && !isClosed) { @@ -909,7 +909,7 @@ object BoundedControlAwareMailbox { } } - private def signalNotFull() { + private def signalNotFull(): Unit = { putLock.lock() try { @@ -919,7 +919,7 @@ object BoundedControlAwareMailbox { } } - private final def enqueueWithTimeout(q: Queue[Envelope], receiver: ActorRef, envelope: Envelope) { + private final def enqueueWithTimeout(q: Queue[Envelope], receiver: ActorRef, envelope: Envelope): Unit = { var remaining = pushTimeOut.toNanos putLock.lockInterruptibly() diff --git a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala b/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala index f041dd2178..2f891bb05b 100644 --- a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala +++ b/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala @@ -210,7 +210,7 @@ trait ExecutorServiceDelegate extends ExecutorService { def execute(command: Runnable) = executor.execute(command) - def shutdown() { executor.shutdown() } + def shutdown(): Unit = { executor.shutdown() } def shutdownNow() = executor.shutdownNow() diff --git a/akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala b/akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala index 2d6b22063b..6862887c24 100644 --- a/akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala +++ b/akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala @@ -353,7 +353,7 @@ private[akka] final class AffinityPoolConfigurator(config: Config, prerequisites } trait RejectionHandler { - def reject(command: Runnable, service: ExecutorService) + def reject(command: Runnable, service: ExecutorService): Unit } trait RejectionHandlerFactory { diff --git a/akka-actor/src/main/scala/akka/event/ActorClassificationUnsubscriber.scala b/akka-actor/src/main/scala/akka/event/ActorClassificationUnsubscriber.scala index c9d12fb60d..91eeb0ee64 100644 --- a/akka-actor/src/main/scala/akka/event/ActorClassificationUnsubscriber.scala +++ b/akka-actor/src/main/scala/akka/event/ActorClassificationUnsubscriber.scala @@ -20,7 +20,7 @@ protected[akka] class ActorClassificationUnsubscriber(bus: ManagedActorClassific private var atSeq = 0 private def nextSeq = atSeq + 1 - override def preStart() { + override def preStart(): Unit = { super.preStart() if (debug) context.system.eventStream.publish(Logging.Debug(simpleName(getClass), getClass, s"will monitor $bus")) } diff --git a/akka-actor/src/main/scala/akka/event/EventStream.scala b/akka-actor/src/main/scala/akka/event/EventStream.scala index 9d11558b67..cbdb26db5b 100644 --- a/akka-actor/src/main/scala/akka/event/EventStream.scala +++ b/akka-actor/src/main/scala/akka/event/EventStream.scala @@ -56,7 +56,7 @@ class EventStream(sys: ActorSystem, private val debug: Boolean) extends LoggingB ret } - override def unsubscribe(subscriber: ActorRef) { + override def unsubscribe(subscriber: ActorRef): Unit = { if (subscriber eq null) throw new IllegalArgumentException("subscriber is null") super.unsubscribe(subscriber) if (debug) publish(Logging.Debug(simpleName(this), this.getClass, "unsubscribing " + subscriber + " from all channels")) diff --git a/akka-actor/src/main/scala/akka/event/EventStreamUnsubscriber.scala b/akka-actor/src/main/scala/akka/event/EventStreamUnsubscriber.scala index 8a23ddd7f5..d2dc7b649e 100644 --- a/akka-actor/src/main/scala/akka/event/EventStreamUnsubscriber.scala +++ b/akka-actor/src/main/scala/akka/event/EventStreamUnsubscriber.scala @@ -24,7 +24,7 @@ protected[akka] class EventStreamUnsubscriber(eventStream: EventStream, debug: B import EventStreamUnsubscriber._ - override def preStart() { + override def preStart(): Unit = { if (debug) eventStream.publish(Logging.Debug(simpleName(getClass), getClass, s"registering unsubscriber with $eventStream")) eventStream initUnsubscriber self } diff --git a/akka-actor/src/main/scala/akka/event/Logging.scala b/akka-actor/src/main/scala/akka/event/Logging.scala index de00d95689..50535f7746 100644 --- a/akka-actor/src/main/scala/akka/event/Logging.scala +++ b/akka-actor/src/main/scala/akka/event/Logging.scala @@ -73,7 +73,7 @@ trait LoggingBus extends ActorEventBus { _logLevel = level } - private def setUpStdoutLogger(config: Settings) { + private def setUpStdoutLogger(config: Settings): Unit = { val level = levelFor(config.StdoutLogLevel) getOrElse { // only log initialization errors directly with StandardOutLogger.print StandardOutLogger.print(Error(new LoggerException, simpleName(this), this.getClass, "unknown akka.stdout-loglevel " + config.StdoutLogLevel)) @@ -89,7 +89,7 @@ trait LoggingBus extends ActorEventBus { /** * Internal Akka use only */ - private[akka] def startStdoutLogger(config: Settings) { + private[akka] def startStdoutLogger(config: Settings): Unit = { setUpStdoutLogger(config) publish(Debug(simpleName(this), this.getClass, "StandardOutLogger started")) } @@ -97,7 +97,7 @@ trait LoggingBus extends ActorEventBus { /** * Internal Akka use only */ - private[akka] def startDefaultLoggers(system: ActorSystemImpl) { + private[akka] def startDefaultLoggers(system: ActorSystemImpl): Unit = { val logName = simpleName(this) + "(" + system + ")" val level = levelFor(system.settings.LogLevel) getOrElse { // only log initialization errors directly with StandardOutLogger.print @@ -152,7 +152,7 @@ trait LoggingBus extends ActorEventBus { /** * Internal Akka use only */ - private[akka] def stopDefaultLoggers(system: ActorSystem) { + private[akka] def stopDefaultLoggers(system: ActorSystem): Unit = { val level = _logLevel // volatile access before reading loggers if (!(loggers contains StandardOutLogger)) { setUpStdoutLogger(system.settings) @@ -1203,7 +1203,7 @@ trait LoggingAdapter { * Log message at info level. * @see [[LoggingAdapter]] */ - def info(message: String) { if (isInfoEnabled) notifyInfo(message) } + def info(message: String): Unit = { if (isInfoEnabled) notifyInfo(message) } /** * Message template with 1 replacement argument. * @@ -1232,7 +1232,7 @@ trait LoggingAdapter { * Log message at debug level. * @see [[LoggingAdapter]] */ - def debug(message: String) { if (isDebugEnabled) notifyDebug(message) } + def debug(message: String): Unit = { if (isDebugEnabled) notifyDebug(message) } /** * Message template with 1 replacement argument. * @@ -1260,7 +1260,7 @@ trait LoggingAdapter { /** * Log message at the specified log level. */ - def log(level: Logging.LogLevel, message: String) { if (isEnabled(level)) notifyLog(level, message) } + def log(level: Logging.LogLevel, message: String): Unit = { if (isEnabled(level)) notifyLog(level, message) } /** * Message template with 1 replacement argument. * diff --git a/akka-actor/src/main/scala/akka/event/jul/JavaLogger.scala b/akka-actor/src/main/scala/akka/event/jul/JavaLogger.scala index eb3a4e9599..43832cc27e 100644 --- a/akka-actor/src/main/scala/akka/event/jul/JavaLogger.scala +++ b/akka-actor/src/main/scala/akka/event/jul/JavaLogger.scala @@ -29,7 +29,7 @@ class JavaLogger extends Actor with RequiresMessageQueue[LoggerMessageQueueSeman case InitializeLogger(_) ⇒ sender() ! LoggerInitialized } - def log(level: logging.Level, cause: Throwable, event: LogEvent) { + def log(level: logging.Level, cause: Throwable, event: LogEvent): Unit = { val logger = Logger(event.logClass, event.logSource) val record = new logging.LogRecord(level, String.valueOf(event.message)) record.setLoggerName(logger.getName) diff --git a/akka-actor/src/main/scala/akka/io/DirectByteBufferPool.scala b/akka-actor/src/main/scala/akka/io/DirectByteBufferPool.scala index 12d69bf55c..84093be99e 100644 --- a/akka-actor/src/main/scala/akka/io/DirectByteBufferPool.scala +++ b/akka-actor/src/main/scala/akka/io/DirectByteBufferPool.scala @@ -9,7 +9,7 @@ import scala.util.control.NonFatal trait BufferPool { def acquire(): ByteBuffer - def release(buf: ByteBuffer) + def release(buf: ByteBuffer): Unit } /** diff --git a/akka-actor/src/main/scala/akka/io/SelectionHandler.scala b/akka-actor/src/main/scala/akka/io/SelectionHandler.scala index 13b28e3c55..9792c13359 100644 --- a/akka-actor/src/main/scala/akka/io/SelectionHandler.scala +++ b/akka-actor/src/main/scala/akka/io/SelectionHandler.scala @@ -47,7 +47,7 @@ private[io] trait ChannelRegistry { * Registers the given channel with the selector, creates a ChannelRegistration instance for it * and dispatches it back to the channelActor calling this `register` */ - def register(channel: SelectableChannel, initialOps: Int)(implicit channelActor: ActorRef) + def register(channel: SelectableChannel, initialOps: Int)(implicit channelActor: ActorRef): Unit } /** @@ -241,8 +241,8 @@ private[io] object SelectionHandler { // FIXME: Add possibility to signal failure of task to someone private abstract class Task extends Runnable { - def tryRun() - def run() { + def tryRun(): Unit + def run(): Unit = { try tryRun() catch { case _: CancelledKeyException ⇒ // ok, can be triggered while setting interest ops diff --git a/akka-actor/src/main/scala/akka/io/TcpListener.scala b/akka-actor/src/main/scala/akka/io/TcpListener.scala index 30ba80bc7c..31e8b3ca1c 100644 --- a/akka-actor/src/main/scala/akka/io/TcpListener.scala +++ b/akka-actor/src/main/scala/akka/io/TcpListener.scala @@ -124,7 +124,7 @@ private[io] class TcpListener( } else if (bind.pullMode) limit else BatchAcceptLimit } - override def postStop() { + override def postStop(): Unit = { try { if (channel.isOpen) { log.debug("Closing serverSocketChannel after being stopped") diff --git a/akka-actor/src/main/scala/akka/io/UdpListener.scala b/akka-actor/src/main/scala/akka/io/UdpListener.scala index 11e6cd5a08..44ba4a08cc 100644 --- a/akka-actor/src/main/scala/akka/io/UdpListener.scala +++ b/akka-actor/src/main/scala/akka/io/UdpListener.scala @@ -84,7 +84,7 @@ private[io] class UdpListener( } def doReceive(registration: ChannelRegistration, handler: ActorRef): Unit = { - @tailrec def innerReceive(readsLeft: Int, buffer: ByteBuffer) { + @tailrec def innerReceive(readsLeft: Int, buffer: ByteBuffer): Unit = { buffer.clear() buffer.limit(DirectBufferSize) diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/DomainName.scala b/akka-actor/src/main/scala/akka/io/dns/internal/DomainName.scala index 8f70b59f8f..9f85a8e30f 100644 --- a/akka-actor/src/main/scala/akka/io/dns/internal/DomainName.scala +++ b/akka-actor/src/main/scala/akka/io/dns/internal/DomainName.scala @@ -17,7 +17,7 @@ private[akka] object DomainName { (name.length + 2).toShort } - def write(it: ByteStringBuilder, name: String) { + def write(it: ByteStringBuilder, name: String): Unit = { for (label ← name.split('.')) { it.putByte(label.length.toByte) for (c ← label) { diff --git a/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala b/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala index 06aaec3534..3ef144e39f 100644 --- a/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala +++ b/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala @@ -695,7 +695,7 @@ class CircuitBreaker( * * @return Promise which executes listener in supplied [[scala.concurrent.ExecutionContext]] */ - protected def notifyTransitionListeners() { + protected def notifyTransitionListeners(): Unit = { if (hasListeners) { val iterator = listeners.iterator while (iterator.hasNext) { diff --git a/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala b/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala index 86f33afe18..1129d296dc 100644 --- a/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala +++ b/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala @@ -42,7 +42,7 @@ trait PipeToSupport { final class PipeableCompletionStage[T](val future: CompletionStage[T])(implicit executionContext: ExecutionContext) { def pipeTo(recipient: ActorRef)(implicit sender: ActorRef = Actor.noSender): CompletionStage[T] = { future whenComplete new BiConsumer[T, Throwable] { - override def accept(t: T, ex: Throwable) { + override def accept(t: T, ex: Throwable): Unit = { if (t != null) recipient ! t if (ex != null) recipient ! Status.Failure(ex) } @@ -50,7 +50,7 @@ trait PipeToSupport { } def pipeToSelection(recipient: ActorSelection)(implicit sender: ActorRef = Actor.noSender): CompletionStage[T] = { future whenComplete new BiConsumer[T, Throwable] { - override def accept(t: T, ex: Throwable) { + override def accept(t: T, ex: Throwable): Unit = { if (t != null) recipient ! t if (ex != null) recipient ! Status.Failure(ex) } diff --git a/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala b/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala index ec87c88fd6..656adec351 100644 --- a/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala +++ b/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala @@ -37,12 +37,12 @@ class BoundedBlockingQueue[E <: AnyRef]( protected def createNotEmptyCondition(): Condition = lock.newCondition() protected def createNotFullCondition(): Condition = lock.newCondition() - def put(e: E) { //Blocks until not full + def put(e: E): Unit = { //Blocks until not full if (e eq null) throw new NullPointerException lock.lockInterruptibly() try { - @tailrec def putElement() { + @tailrec def putElement(): Unit = { if (backing.size() < maxCapacity) { require(backing.offer(e)) notEmpty.signal() @@ -148,7 +148,7 @@ class BoundedBlockingQueue[E <: AnyRef]( try backing.contains(e) finally lock.unlock() } - override def clear() { + override def clear(): Unit = { lock.lock() try { backing.clear() @@ -244,7 +244,7 @@ class BoundedBlockingQueue[E <: AnyRef]( elements(last).asInstanceOf[E] } - override def remove() { + override def remove(): Unit = { if (last < 0) throw new IllegalStateException val target = elements(last) last = -1 //To avoid 2 subsequent removes without a next in between diff --git a/akka-actor/src/main/scala/akka/util/ByteString.scala b/akka-actor/src/main/scala/akka/util/ByteString.scala index 61651c9dbd..94f29b4554 100644 --- a/akka-actor/src/main/scala/akka/util/ByteString.scala +++ b/akka-actor/src/main/scala/akka/util/ByteString.scala @@ -618,12 +618,12 @@ object ByteString { @SerialVersionUID(1L) private class SerializationProxy(@transient private var orig: ByteString) extends Serializable { - private def writeObject(out: ObjectOutputStream) { + private def writeObject(out: ObjectOutputStream): Unit = { out.writeByte(orig.byteStringCompanion.SerializationIdentity) orig.writeToOutputStream(out) } - private def readObject(in: ObjectInputStream) { + private def readObject(in: ObjectInputStream): Unit = { val serializationId = in.readByte() orig = Companion(from = serializationId).readFromInputStream(in) diff --git a/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala b/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala index 119bc88e53..6fa8575e6f 100644 --- a/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala +++ b/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala @@ -41,7 +41,7 @@ private[akka] final class SerializedSuspendableExecutionContext(throughput: Int) val c = state.get state.compareAndSet(c, c | newState) || addState(newState) } - @tailrec private final def remState(oldState: Int) { + @tailrec private final def remState(oldState: Int): Unit = { val c = state.get if (state.compareAndSet(c, c & ~oldState)) attach() else remState(oldState) } diff --git a/akka-bench-jmh/src/main/scala/akka/persistence/LevelDbBatchingBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/persistence/LevelDbBatchingBenchmark.scala index 85f205350e..401ef76c4e 100644 --- a/akka-bench-jmh/src/main/scala/akka/persistence/LevelDbBatchingBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/persistence/LevelDbBatchingBenchmark.scala @@ -98,7 +98,7 @@ class LevelDbBatchingBenchmark { // TOOLS - private def deleteStorage(sys: ActorSystem) { + private def deleteStorage(sys: ActorSystem): Unit = { val storageLocations = List( "akka.persistence.journal.leveldb.dir", "akka.persistence.journal.leveldb-shared.store.dir", diff --git a/akka-camel/src/main/scala/akka/camel/Consumer.scala b/akka-camel/src/main/scala/akka/camel/Consumer.scala index 67a700f71b..4fdc87ad33 100644 --- a/akka-camel/src/main/scala/akka/camel/Consumer.scala +++ b/akka-camel/src/main/scala/akka/camel/Consumer.scala @@ -25,7 +25,7 @@ trait Consumer extends Actor with CamelSupport { * Registers the consumer endpoint. Note: when overriding this method, be sure to * call 'super.preRestart', otherwise the consumer endpoint will not be registered. */ - override def preStart() { + override def preStart(): Unit = { super.preStart() // Possible FIXME. registering the endpoint here because of problems // with order of execution of trait body in the Java version (UntypedConsumerActor) @@ -34,7 +34,7 @@ trait Consumer extends Actor with CamelSupport { register() } - private[this] def register() { + private[this] def register(): Unit = { camel.supervisor ! Register(self, endpointUri, Some(ConsumerConfig(activationTimeout, replyTimeout, autoAck, onRouteDefinition))) } diff --git a/akka-camel/src/main/scala/akka/camel/Producer.scala b/akka-camel/src/main/scala/akka/camel/Producer.scala index fc79d27bae..1d7655633d 100644 --- a/akka-camel/src/main/scala/akka/camel/Producer.scala +++ b/akka-camel/src/main/scala/akka/camel/Producer.scala @@ -18,12 +18,12 @@ trait ProducerSupport extends Actor with CamelSupport { private[this] var messages = Vector.empty[(ActorRef, Any)] private[this] var producerChild: Option[ActorRef] = None - override def preStart() { + override def preStart(): Unit = { super.preStart() register() } - private[this] def register() { camel.supervisor ! Register(self, endpointUri) } + private[this] def register(): Unit = { camel.supervisor ! Register(self, endpointUri) } /** * CamelMessage headers to copy by default from request message to response-message. diff --git a/akka-camel/src/main/scala/akka/camel/internal/CamelSupervisor.scala b/akka-camel/src/main/scala/akka/camel/internal/CamelSupervisor.scala index f719d2c775..bd06f0bc95 100644 --- a/akka-camel/src/main/scala/akka/camel/internal/CamelSupervisor.scala +++ b/akka-camel/src/main/scala/akka/camel/internal/CamelSupervisor.scala @@ -146,9 +146,9 @@ private[camel] class Registry(activationTracker: ActorRef) extends Actor with Ca } } - private def deRegisterConsumer(actorRef: ActorRef) { consumerRegistrar ! DeRegister(actorRef) } + private def deRegisterConsumer(actorRef: ActorRef): Unit = { consumerRegistrar ! DeRegister(actorRef) } - private def deRegisterProducer(actorRef: ActorRef) { producerRegistrar ! DeRegister(actorRef) } + private def deRegisterProducer(actorRef: ActorRef): Unit = { producerRegistrar ! DeRegister(actorRef) } } /** diff --git a/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala b/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala index 14e33c957f..f7e89d9d7e 100644 --- a/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala +++ b/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala @@ -126,7 +126,7 @@ private[camel] class ActorProducer(val endpoint: ActorEndpoint, camel: Camel) ex */ private[camel] def processExchangeAdapter(exchange: CamelExchangeAdapter): Unit = { val isDone = new CountDownLatch(1) - processExchangeAdapter(exchange, new AsyncCallback { def done(doneSync: Boolean) { isDone.countDown() } }) + processExchangeAdapter(exchange, new AsyncCallback { def done(doneSync: Boolean): Unit = { isDone.countDown() } }) isDone.await(endpoint.replyTimeout.length, endpoint.replyTimeout.unit) } diff --git a/akka-camel/src/test/scala/akka/camel/ActivationIntegrationTest.scala b/akka-camel/src/test/scala/akka/camel/ActivationIntegrationTest.scala index 1efca306a3..12efa13051 100644 --- a/akka-camel/src/test/scala/akka/camel/ActivationIntegrationTest.scala +++ b/akka-camel/src/test/scala/akka/camel/ActivationIntegrationTest.scala @@ -37,7 +37,7 @@ class ActivationIntegrationTest extends WordSpec with Matchers with SharedCamelS def endpointUri = "direct:a3" def receive = { case _ ⇒ {} } - override def postStop() { + override def postStop(): Unit = { super.postStop() latch.countDown() } @@ -69,7 +69,7 @@ class ActivationIntegrationTest extends WordSpec with Matchers with SharedCamelS class TestConsumer(uri: String, latch: TestLatch) extends Consumer { def endpointUri = uri - override def preStart() { + override def preStart(): Unit = { Await.ready(latch, 60 seconds) super.preStart() } diff --git a/akka-camel/src/test/scala/akka/camel/ConcurrentActivationTest.scala b/akka-camel/src/test/scala/akka/camel/ConcurrentActivationTest.scala index f87a36e7c6..6c6d364d66 100644 --- a/akka-camel/src/test/scala/akka/camel/ConcurrentActivationTest.scala +++ b/akka-camel/src/test/scala/akka/camel/ConcurrentActivationTest.scala @@ -62,7 +62,7 @@ class ConcurrentActivationTest extends WordSpec with Matchers with NonSharedCame // should be the size of the activated activated producers and consumers deactivations.size should ===(2 * number * number) def partitionNames(refs: immutable.Seq[ActorRef]) = refs.map(_.path.name).partition(_.startsWith("concurrent-test-echo-consumer")) - def assertContainsSameElements(lists: (Seq[_], Seq[_])) { + def assertContainsSameElements(lists: (Seq[_], Seq[_])): Unit = { val (a, b) = lists a.intersect(b).size should ===(a.size) } @@ -144,7 +144,7 @@ class Registrar(val start: Int, val number: Int, activationsPromise: Promise[Lis } } - def add(actor: ⇒ Actor, name: String) { + def add(actor: ⇒ Actor, name: String): Unit = { val ref = context.actorOf(Props(actor), name) actorRefs = actorRefs + ref val result = camel.activationFutureFor(ref) diff --git a/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala b/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala index dacf57dc33..3e938c668e 100644 --- a/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala +++ b/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala @@ -72,7 +72,7 @@ class ConsumerIntegrationTest extends WordSpec with Matchers with NonSharedCamel case m: CamelMessage ⇒ sender() ! "received " + m.bodyAs[String] } - override def postRestart(reason: Throwable) { + override def postRestart(reason: Throwable): Unit = { restarted.countDown() } }, "direct-a2") @@ -182,7 +182,7 @@ class ErrorThrowingConsumer(override val endpointUri: String) extends Consumer { def receive = { case msg: CamelMessage ⇒ throw new TestException("error: %s" format msg.body) } - override def preRestart(reason: Throwable, message: Option[Any]) { + override def preRestart(reason: Throwable, message: Option[Any]): Unit = { super.preRestart(reason, message) sender() ! Failure(reason) } @@ -197,7 +197,7 @@ class ErrorRespondingConsumer(override val endpointUri: String) extends Consumer rd.onException(classOf[TestException]).handled(true).transform(Builder.body.append(" has an error")).end } - final override def preRestart(reason: Throwable, message: Option[Any]) { + final override def preRestart(reason: Throwable, message: Option[Any]): Unit = { super.preRestart(reason, message) sender() ! Failure(reason) } @@ -213,7 +213,7 @@ class FailingOnceConsumer(override val endpointUri: String) extends Consumer { throw new TestException("rejected: %s" format msg.body) } - final override def preRestart(reason: Throwable, message: Option[Any]) { + final override def preRestart(reason: Throwable, message: Option[Any]): Unit = { super.preRestart(reason, message) sender() ! Failure(reason) } diff --git a/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala b/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala index dca48eda8b..6489960a55 100644 --- a/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala +++ b/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala @@ -27,7 +27,7 @@ class ProducerFeatureTest extends TestKit(ActorSystem("ProducerFeatureTest", Akk import ProducerFeatureTest._ implicit def camel = CamelExtension(system) - override protected def afterAll() { + override protected def afterAll(): Unit = { super.afterAll() shutdown() } @@ -37,9 +37,9 @@ class ProducerFeatureTest extends TestKit(ActorSystem("ProducerFeatureTest", Akk camelContext.setUseBreadcrumb(false) val timeoutDuration = 1 second implicit val timeout = Timeout(timeoutDuration) - override protected def beforeAll { camelContext.addRoutes(new TestRoute(system)) } + override protected def beforeAll: Unit = { camelContext.addRoutes(new TestRoute(system)) } - override protected def afterEach { mockEndpoint.reset() } + override protected def afterEach: Unit = { mockEndpoint.reset() } "A Producer on a sync Camel route" must { @@ -279,7 +279,7 @@ object ProducerFeatureTest { else msg } - override def postStop() { + override def postStop(): Unit = { for (msg ← lastMessage; aref ← lastSender) context.parent ! ((aref, msg)) super.postStop() } @@ -288,7 +288,7 @@ object ProducerFeatureTest { class TestProducer(uri: String, upper: Boolean = false) extends Actor with Producer { def endpointUri = uri - override def preRestart(reason: Throwable, message: Option[Any]) { + override def preRestart(reason: Throwable, message: Option[Any]): Unit = { //overriding on purpose so it doesn't try to deRegister and reRegister at restart, // which would cause a deadletter message in the test output. } @@ -339,7 +339,7 @@ object ProducerFeatureTest { class TestRoute(system: ActorSystem) extends RouteBuilder { val responder = system.actorOf(Props[TestResponder], name = "TestResponder") - def configure { + def configure: Unit = { from("direct:forward-test-1").to("mock:mock") // for one-way messaging tests from("direct:producer-test-1").to("mock:mock") diff --git a/akka-camel/src/test/scala/akka/camel/TestSupport.scala b/akka-camel/src/test/scala/akka/camel/TestSupport.scala index dd13653854..a435c670f9 100644 --- a/akka-camel/src/test/scala/akka/camel/TestSupport.scala +++ b/akka-camel/src/test/scala/akka/camel/TestSupport.scala @@ -21,7 +21,7 @@ private[camel] object TestSupport { def start(actor: ⇒ Actor, name: String)(implicit system: ActorSystem, timeout: Timeout): ActorRef = Await.result(CamelExtension(system).activationFutureFor(system.actorOf(Props(actor), name))(timeout, system.dispatcher), timeout.duration) - def stop(actorRef: ActorRef)(implicit system: ActorSystem, timeout: Timeout) { + def stop(actorRef: ActorRef)(implicit system: ActorSystem, timeout: Timeout): Unit = { system.stop(actorRef) Await.result(CamelExtension(system).deactivationFutureFor(actorRef)(timeout, system.dispatcher), timeout.duration) } @@ -51,7 +51,7 @@ private[camel] object TestSupport { implicit lazy val system = ActorSystem("SharedCamelSystem", AkkaSpec.testConf) implicit lazy val camel = CamelExtension(system) - abstract override protected def afterAll() { + abstract override protected def afterAll(): Unit = { super.afterAll() TestKit.shutdownActorSystem(system) } @@ -61,13 +61,13 @@ private[camel] object TestSupport { implicit var system: ActorSystem = _ implicit var camel: Camel = _ - override protected def beforeEach() { + override protected def beforeEach(): Unit = { super.beforeEach() system = ActorSystem("NonSharedCamelSystem", AkkaSpec.testConf) camel = CamelExtension(system) } - override protected def afterEach() { + override protected def afterEach(): Unit = { TestKit.shutdownActorSystem(system) super.afterEach() } diff --git a/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala b/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala index 42a4adb0c0..6b23cf288e 100644 --- a/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala +++ b/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala @@ -79,7 +79,7 @@ class UntypedProducerTest extends WordSpec with Matchers with BeforeAndAfterAll object UntypedProducerTest { class TestRoute extends RouteBuilder { - def configure { + def configure: Unit = { from("direct:forward-test-1").to("mock:mock") from("direct:producer-test-1").process(new Processor() { def process(exchange: Exchange) = { diff --git a/akka-camel/src/test/scala/akka/camel/internal/ActivationTrackerTest.scala b/akka-camel/src/test/scala/akka/camel/internal/ActivationTrackerTest.scala index b4028f5091..93fe30eeba 100644 --- a/akka-camel/src/test/scala/akka/camel/internal/ActivationTrackerTest.scala +++ b/akka-camel/src/test/scala/akka/camel/internal/ActivationTrackerTest.scala @@ -13,14 +13,14 @@ import akka.camel.internal.ActivationProtocol._ class ActivationTrackerTest extends TestKit(ActorSystem("ActivationTrackerTest")) with WordSpecLike with Matchers with BeforeAndAfterAll with BeforeAndAfterEach with GivenWhenThen { - override protected def afterAll() { shutdown() } + override protected def afterAll(): Unit = { shutdown() } var actor: TestProbe = _ var awaiting: Awaiting = _ var anotherAwaiting: Awaiting = _ val cause = new Exception("cause of failure") - override protected def beforeEach() { + override protected def beforeEach(): Unit = { actor = TestProbe() awaiting = new Awaiting(actor) anotherAwaiting = new Awaiting(actor) diff --git a/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala b/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala index b45698e028..039c7ad781 100644 --- a/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala +++ b/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala @@ -113,7 +113,7 @@ class ActorProducerTest extends TestKit(ActorSystem("ActorProducerTest")) with W "response is not sent by actor" must { val latch = TestLatch(1) val callback = new AsyncCallback { - def done(doneSync: Boolean) { + def done(doneSync: Boolean): Unit = { latch.countDown() } } @@ -339,7 +339,7 @@ private[camel] trait ActorProducerFixture extends MockitoSugar with BeforeAndAft var actorEndpointPath: ActorEndpointPath = _ var actorComponent: ActorComponent = _ - override protected def beforeEach() { + override protected def beforeEach(): Unit = { asyncCallback = createAsyncCallback probe = TestProbe() @@ -380,7 +380,7 @@ private[camel] trait ActorProducerFixture extends MockitoSugar with BeforeAndAft message = CamelMessage(null, null) } - override protected def afterAll() { + override protected def afterAll(): Unit = { shutdown() } @@ -396,12 +396,12 @@ private[camel] trait ActorProducerFixture extends MockitoSugar with BeforeAndAft class TestAsyncCallback extends AsyncCallback { def expectNoCallWithin(duration: Duration): Unit = if (callbackReceived.await(duration.length, duration.unit)) fail("NOT expected callback, but received one!") - def awaitCalled(timeout: Duration = 1 second) { valueWithin(1 second) } + def awaitCalled(timeout: Duration = 1 second): Unit = { valueWithin(1 second) } val callbackReceived = new CountDownLatch(1) val callbackValue = new AtomicBoolean() - def done(doneSync: Boolean) { + def done(doneSync: Boolean): Unit = { callbackValue set doneSync callbackReceived.countDown() } @@ -422,7 +422,7 @@ private[camel] trait ActorProducerFixture extends MockitoSugar with BeforeAndAft endpoint } - def prepareMocks(actor: ActorRef, message: CamelMessage = message, outCapable: Boolean) { + def prepareMocks(actor: ActorRef, message: CamelMessage = message, outCapable: Boolean): Unit = { when(actorEndpointPath.findActorIn(any[ActorSystem])) thenReturn Option(actor) when(exchange.toRequestMessage(any[Map[String, Any]])) thenReturn message when(exchange.isOutCapable) thenReturn outCapable diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala index 66941f095c..b7e403e484 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala @@ -107,12 +107,12 @@ abstract class ClusterShardingFailureSpec(config: ClusterShardingFailureSpecConf val storageLocations = List(new File(system.settings.config.getString( "akka.cluster.sharding.distributed-data.durable.lmdb.dir")).getParentFile) - override protected def atStartup() { + override protected def atStartup(): Unit = { storageLocations.foreach(dir ⇒ if (dir.exists) FileUtils.deleteQuietly(dir)) enterBarrier("startup") } - override protected def afterTermination() { + override protected def afterTermination(): Unit = { storageLocations.foreach(dir ⇒ if (dir.exists) FileUtils.deleteQuietly(dir)) } diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala index 37244d3ffa..f950bd2ac6 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala @@ -88,12 +88,12 @@ abstract class ClusterShardingGracefulShutdownSpec(config: ClusterShardingGracef val storageLocations = List(new File(system.settings.config.getString( "akka.cluster.sharding.distributed-data.durable.lmdb.dir")).getParentFile) - override protected def atStartup() { + override protected def atStartup(): Unit = { storageLocations.foreach(dir ⇒ if (dir.exists) FileUtils.deleteQuietly(dir)) enterBarrier("startup") } - override protected def afterTermination() { + override protected def afterTermination(): Unit = { storageLocations.foreach(dir ⇒ if (dir.exists) FileUtils.deleteQuietly(dir)) } diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingLeavingSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingLeavingSpec.scala index dce44fe694..345dc6f040 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingLeavingSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingLeavingSpec.scala @@ -107,12 +107,12 @@ abstract class ClusterShardingLeavingSpec(config: ClusterShardingLeavingSpecConf val storageLocations = List(new File(system.settings.config.getString( "akka.cluster.sharding.distributed-data.durable.lmdb.dir")).getParentFile) - override protected def atStartup() { + override protected def atStartup(): Unit = { storageLocations.foreach(dir ⇒ if (dir.exists) FileUtils.deleteQuietly(dir)) enterBarrier("startup") } - override protected def afterTermination() { + override protected def afterTermination(): Unit = { storageLocations.foreach(dir ⇒ if (dir.exists) FileUtils.deleteQuietly(dir)) } diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingMinMembersSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingMinMembersSpec.scala index daf58238f7..dd8c84eb27 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingMinMembersSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingMinMembersSpec.scala @@ -87,12 +87,12 @@ abstract class ClusterShardingMinMembersSpec(config: ClusterShardingMinMembersSp val storageLocations = List(new File(system.settings.config.getString( "akka.cluster.sharding.distributed-data.durable.lmdb.dir")).getParentFile) - override protected def atStartup() { + override protected def atStartup(): Unit = { storageLocations.foreach(dir ⇒ if (dir.exists) FileUtils.deleteQuietly(dir)) enterBarrier("startup") } - override protected def afterTermination() { + override protected def afterTermination(): Unit = { storageLocations.foreach(dir ⇒ if (dir.exists) FileUtils.deleteQuietly(dir)) } diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesNewExtractorSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesNewExtractorSpec.scala index 74ae2c836c..7f528b0193 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesNewExtractorSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesNewExtractorSpec.scala @@ -133,12 +133,12 @@ abstract class ClusterShardingRememberEntitiesNewExtractorSpec(config: ClusterSh val storageLocations = List(new File(system.settings.config.getString( "akka.cluster.sharding.distributed-data.durable.lmdb.dir")).getParentFile) - override protected def atStartup() { + override protected def atStartup(): Unit = { storageLocations.foreach(dir ⇒ if (dir.exists) FileUtils.deleteQuietly(dir)) enterBarrier("startup") } - override protected def afterTermination() { + override protected def afterTermination(): Unit = { storageLocations.foreach(dir ⇒ if (dir.exists) FileUtils.deleteQuietly(dir)) } diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesSpec.scala index 38c4a00adc..89643b1559 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesSpec.scala @@ -110,12 +110,12 @@ abstract class ClusterShardingRememberEntitiesSpec(config: ClusterShardingRememb val storageLocations = List(new File(system.settings.config.getString( "akka.cluster.sharding.distributed-data.durable.lmdb.dir")).getParentFile) - override protected def atStartup() { + override protected def atStartup(): Unit = { storageLocations.foreach(dir ⇒ if (dir.exists) FileUtils.deleteQuietly(dir)) enterBarrier("startup") } - override protected def afterTermination() { + override protected def afterTermination(): Unit = { storageLocations.foreach(dir ⇒ if (dir.exists) FileUtils.deleteQuietly(dir)) } diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala index 8ba69fa093..f64235d65b 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala @@ -262,12 +262,12 @@ abstract class ClusterShardingSpec(config: ClusterShardingSpecConfig) extends Mu val storageLocations = List(new File(system.settings.config.getString( "akka.cluster.sharding.distributed-data.durable.lmdb.dir")).getParentFile) - override protected def atStartup() { + override protected def atStartup(): Unit = { storageLocations.foreach(dir ⇒ if (dir.exists) FileUtils.deleteQuietly(dir)) enterBarrier("startup") } - override protected def afterTermination() { + override protected def afterTermination(): Unit = { storageLocations.foreach(dir ⇒ if (dir.exists) FileUtils.deleteQuietly(dir)) } diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala index bed25c848e..d9f857a517 100644 --- a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala +++ b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala @@ -199,7 +199,7 @@ final class ClusterSingletonProxy(singletonManagerPath: String, settings: Cluste /** * Discard old singleton ActorRef and send a periodic message to self to identify the singleton. */ - def identifySingleton() { + def identifySingleton(): Unit = { import context.dispatcher log.debug("Creating singleton identification timer...") identifyCounter += 1 diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala index af9d837e1c..70cc83ef86 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala @@ -29,7 +29,7 @@ object DistributedPubSubMediatorRouterSpec { } trait DistributedPubSubMediatorRouterSpec { this: WordSpecLike with TestKit with ImplicitSender ⇒ - def nonUnwrappingPubSub(mediator: ActorRef, testActor: ActorRef, msg: Any) { + def nonUnwrappingPubSub(mediator: ActorRef, testActor: ActorRef, msg: Any): Unit = { val path = testActor.path.toStringWithoutAddress diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala index c669aaaea2..73737445c4 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala @@ -55,7 +55,7 @@ object ClusterSingletonProxySpec { "user/singletonManager", settings = ClusterSingletonProxySettings(system)), s"singletonProxy-${cluster.selfAddress.port.getOrElse(0)}") - def testProxy(msg: String) { + def testProxy(msg: String): Unit = { val probe = TestProbe() probe.send(proxy, msg) // 25 seconds to make sure the singleton was started up diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala index 174bb0b75e..f9b48f0485 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala @@ -523,7 +523,7 @@ private[cluster] final class ClusterDomainEventPublisher extends Actor with Acto var membershipState: MembershipState = emptyMembershipState def selfDc = cluster.settings.SelfDataCenter - override def preRestart(reason: Throwable, message: Option[Any]) { + override def preRestart(reason: Throwable, message: Option[Any]): Unit = { // don't postStop when restarted, no children to stop } diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala index 7534650d3b..570be169fe 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala @@ -112,19 +112,19 @@ trait ClusterNodeMBean { * The address format is `akka.tcp://actor-system-name@hostname:port`. * A 'Join(thisNodeAddress)' command is sent to the node to join. */ - def join(address: String) + def join(address: String): Unit /** * Send command to issue state transition to LEAVING for the node specified by 'address'. * The address format is `akka.tcp://actor-system-name@hostname:port` */ - def leave(address: String) + def leave(address: String): Unit /** * Send command to DOWN the node specified by 'address'. * The address format is `akka.tcp://actor-system-name@hostname:port` */ - def down(address: String) + def down(address: String): Unit } /** diff --git a/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala b/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala index 5752f33d4c..b2f182490b 100644 --- a/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala @@ -187,7 +187,7 @@ class GossipSpec extends WordSpec with Matchers { val g2 = (Gossip(members = SortedSet(a1, b1, c1, d1)) :+ vclockNode).seen(a1.uniqueAddress).seen(c1.uniqueAddress) val g3 = (g1 copy (version = g2.version)).seen(d1.uniqueAddress) - def checkMerged(merged: Gossip) { + def checkMerged(merged: Gossip): Unit = { val seen = merged.overview.seen.toSeq seen.length should ===(0) diff --git a/akka-contrib/src/main/scala/akka/contrib/jul/JavaLogger.scala b/akka-contrib/src/main/scala/akka/contrib/jul/JavaLogger.scala index c5e46e49e5..785c805709 100644 --- a/akka-contrib/src/main/scala/akka/contrib/jul/JavaLogger.scala +++ b/akka-contrib/src/main/scala/akka/contrib/jul/JavaLogger.scala @@ -46,7 +46,7 @@ class JavaLogger extends Actor with RequiresMessageQueue[LoggerMessageQueueSeman } @inline - def log(level: logging.Level, cause: Throwable, event: LogEvent) { + def log(level: logging.Level, cause: Throwable, event: LogEvent): Unit = { val logger = logging.Logger.getLogger(event.logSource) val record = new logging.LogRecord(level, String.valueOf(event.message)) record.setLoggerName(logger.getName) @@ -90,7 +90,7 @@ trait JavaLoggingAdapter extends LoggingAdapter { log(logging.Level.CONFIG, null, message) @inline - def log(level: logging.Level, cause: Throwable, message: String) { + def log(level: logging.Level, cause: Throwable, message: String): Unit = { val record = new logging.LogRecord(level, message) record.setLoggerName(logger.getName) record.setThrown(cause) @@ -106,7 +106,7 @@ trait JavaLoggingAdapter extends LoggingAdapter { } // it is unfortunate that this workaround is needed - private def updateSource(record: logging.LogRecord) { + private def updateSource(record: logging.LogRecord): Unit = { val stack = Thread.currentThread.getStackTrace val source = stack.find { frame ⇒ diff --git a/akka-contrib/src/main/scala/akka/contrib/pattern/ReliableProxy.scala b/akka-contrib/src/main/scala/akka/contrib/pattern/ReliableProxy.scala index ff60a1a4eb..d001fe1c0c 100644 --- a/akka-contrib/src/main/scala/akka/contrib/pattern/ReliableProxy.scala +++ b/akka-contrib/src/main/scala/akka/contrib/pattern/ReliableProxy.scala @@ -271,7 +271,7 @@ class ReliableProxy(targetPath: ActorPath, retryAfter: FiniteDuration, case _ ⇒ SupervisorStrategy.Escalate } - override def postStop() { + override def postStop(): Unit = { logDebug("Stopping proxy and sending {} messages to subscribers in Unsent", stateData.size) gossip(ProxyTerminated(self, Unsent(stateData))) super.postStop() @@ -381,7 +381,7 @@ class ReliableProxy(targetPath: ActorPath, retryAfter: FiniteDuration, * * This and nextBackoff are meant to be implemented by subclasses. */ - def resetBackoff() {} + def resetBackoff(): Unit = {} /** * Returns the next retry interval duration. By default each interval is the same, reconnectAfter. diff --git a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala b/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala index 1d1a2d8555..50c1c3f3ec 100644 --- a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala +++ b/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala @@ -36,7 +36,7 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod override def initialParticipants = roles.size - override def afterEach() { + override def afterEach(): Unit = { runOn(local) { testConductor.passThrough(local, remote, Direction.Both).await } diff --git a/akka-contrib/src/test/scala/akka/contrib/jul/JavaLoggerSpec.scala b/akka-contrib/src/test/scala/akka/contrib/jul/JavaLoggerSpec.scala index fffc296b3c..bc78ce830b 100644 --- a/akka-contrib/src/test/scala/akka/contrib/jul/JavaLoggerSpec.scala +++ b/akka-contrib/src/test/scala/akka/contrib/jul/JavaLoggerSpec.scala @@ -32,12 +32,12 @@ class JavaLoggerSpec extends AkkaSpec(JavaLoggerSpec.config) { val logger = logging.Logger.getLogger("akka://JavaLoggerSpec/user/log") logger.setUseParentHandlers(false) // turn off output of test LogRecords logger.addHandler(new logging.Handler { - def publish(record: logging.LogRecord) { + def publish(record: logging.LogRecord): Unit = { testActor ! record } - def flush() {} - def close() {} + def flush(): Unit = {} + def close(): Unit = {} }) val producer = system.actorOf(Props[JavaLoggerSpec.LogProducer], name = "log") diff --git a/akka-contrib/src/test/scala/akka/contrib/mailbox/PeekMailboxSpec.scala b/akka-contrib/src/test/scala/akka/contrib/mailbox/PeekMailboxSpec.scala index 2105a1b3b3..87f8a87e04 100644 --- a/akka-contrib/src/test/scala/akka/contrib/mailbox/PeekMailboxSpec.scala +++ b/akka-contrib/src/test/scala/akka/contrib/mailbox/PeekMailboxSpec.scala @@ -27,7 +27,7 @@ object PeekMailboxSpec { togo -= 1 PeekMailboxExtension.ack() } - override def preRestart(cause: Throwable, msg: Option[Any]) { + override def preRestart(cause: Throwable, msg: Option[Any]): Unit = { for (m ← msg if m == "DIE") context stop self // for testing the case of mailbox.cleanUp } } @@ -103,12 +103,12 @@ class MyActor extends Actor { //#business-logic-elided var i = 0 - def doStuff(m: Any) { + def doStuff(m: Any): Unit = { if (i == 1) throw new Exception("DONTWANNA") i += 1 } - override def postStop() { + override def postStop(): Unit = { context.system.terminate() } //#business-logic-elided diff --git a/akka-contrib/src/test/scala/akka/contrib/pattern/AggregatorSpec.scala b/akka-contrib/src/test/scala/akka/contrib/pattern/AggregatorSpec.scala index 57099b5b85..ca271cc32a 100644 --- a/akka-contrib/src/test/scala/akka/contrib/pattern/AggregatorSpec.scala +++ b/akka-contrib/src/test/scala/akka/contrib/pattern/AggregatorSpec.scala @@ -94,7 +94,7 @@ class AccountBalanceRetriever extends Actor with Aggregator { //#expect-timeout //#expect-balance - def fetchCheckingAccountsBalance() { + def fetchCheckingAccountsBalance(): Unit = { context.actorOf(Props[CheckingAccountProxy]) ! GetAccountBalances(id) expectOnce { case CheckingAccountBalances(balances) ⇒ @@ -104,7 +104,7 @@ class AccountBalanceRetriever extends Actor with Aggregator { } //#expect-balance - def fetchSavingsAccountsBalance() { + def fetchSavingsAccountsBalance(): Unit = { context.actorOf(Props[SavingsAccountProxy]) ! GetAccountBalances(id) expectOnce { case SavingsAccountBalances(balances) ⇒ @@ -113,7 +113,7 @@ class AccountBalanceRetriever extends Actor with Aggregator { } } - def fetchMoneyMarketAccountsBalance() { + def fetchMoneyMarketAccountsBalance(): Unit = { context.actorOf(Props[MoneyMarketAccountProxy]) ! GetAccountBalances(id) expectOnce { case MoneyMarketAccountBalances(balances) ⇒ @@ -122,7 +122,7 @@ class AccountBalanceRetriever extends Actor with Aggregator { } } - def collectBalances(force: Boolean = false) { + def collectBalances(force: Boolean = false): Unit = { if (results.size == types.size || force) { originalSender ! results.toList // Make sure it becomes immutable context.stop(self) @@ -167,7 +167,7 @@ class ChainingSample extends Actor with Aggregator { case TimedOut ⇒ processList() } - def processList() { + def processList(): Unit = { unexpect(handle) if (values.size > 0) { @@ -179,7 +179,7 @@ class ChainingSample extends Actor with Aggregator { } //#unexpect-sample - def processFinal(eval: List[Int]) { + def processFinal(eval: List[Int]): Unit = { // Select only the entries coming back from eval originalSender ! FinalResponse(eval map values) context.stop(self) diff --git a/akka-contrib/src/test/scala/akka/contrib/throttle/TimerBasedThrottlerSpec.scala b/akka-contrib/src/test/scala/akka/contrib/throttle/TimerBasedThrottlerSpec.scala index f93facc8b6..08aa35970f 100644 --- a/akka-contrib/src/test/scala/akka/contrib/throttle/TimerBasedThrottlerSpec.scala +++ b/akka-contrib/src/test/scala/akka/contrib/throttle/TimerBasedThrottlerSpec.scala @@ -35,7 +35,7 @@ class TimerBasedThrottlerSpec extends TestKit(ActorSystem("TimerBasedThrottlerSp import TimerBasedThrottlerSpec._ - override def afterAll { + override def afterAll: Unit = { shutdown() } diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/VersionVectorSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/VersionVectorSpec.scala index e595747593..fa4ebf4503 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/VersionVectorSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/VersionVectorSpec.scala @@ -20,7 +20,7 @@ class VersionVectorSpec extends TestKit(ActorSystem("VersionVectorSpec")) val node3 = UniqueAddress(node1.address.copy(port = Some(2553)), 3) val node4 = UniqueAddress(node1.address.copy(port = Some(2554)), 4) - override def afterAll { + override def afterAll: Unit = { shutdown() } diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala index 6069f95b7a..d67efc3fb7 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala @@ -51,7 +51,7 @@ class ReplicatedDataSerializerSpec extends TestKit(ActorSystem( val ref2 = system.actorOf(Props.empty, "ref2") val ref3 = system.actorOf(Props.empty, "ref3") - override def afterAll { + override def afterAll: Unit = { shutdown() } diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala index d877bcf346..5dbb112b72 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala @@ -51,7 +51,7 @@ class ReplicatorMessageSerializerSpec extends TestKit(ActorSystem( val keyA = GSetKey[String]("A") - override def afterAll { + override def afterAll: Unit = { shutdown() } diff --git a/akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala b/akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala index 8ef6cb2fd4..01d93d6eca 100644 --- a/akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala +++ b/akka-docs/src/test/scala/docs/actor/ActorDocSpec.scala @@ -123,13 +123,13 @@ class ActorWithMessagesWrapper { class Hook extends Actor { var child: ActorRef = _ //#preStart - override def preStart() { + override def preStart(): Unit = { child = context.actorOf(Props[MyActor], "child") } //#preStart def receive = Actor.emptyBehavior //#postStop - override def postStop() { + override def postStop(): Unit = { //#clean-up-some-resources () //#clean-up-some-resources diff --git a/akka-docs/src/test/scala/docs/actor/FSMDocSpec.scala b/akka-docs/src/test/scala/docs/actor/FSMDocSpec.scala index 3cc50c694a..7aa516b7b2 100644 --- a/akka-docs/src/test/scala/docs/actor/FSMDocSpec.scala +++ b/akka-docs/src/test/scala/docs/actor/FSMDocSpec.scala @@ -125,7 +125,7 @@ class FSMDocSpec extends MyFavoriteTestFrameWorkPlusAkkaTestKit { //#alt-transition-syntax onTransition(handler _) - def handler(from: StateType, to: StateType) { + def handler(from: StateType, to: StateType): Unit = { // handle it here ... } //#alt-transition-syntax diff --git a/akka-docs/src/test/scala/docs/actor/FaultHandlingDocSample.scala b/akka-docs/src/test/scala/docs/actor/FaultHandlingDocSample.scala index 115cc6e8c4..2cd2fc7364 100644 --- a/akka-docs/src/test/scala/docs/actor/FaultHandlingDocSample.scala +++ b/akka-docs/src/test/scala/docs/actor/FaultHandlingDocSample.scala @@ -149,7 +149,7 @@ class CounterService extends Actor { import context.dispatcher // Use this Actors' Dispatcher as ExecutionContext - override def preStart() { + override def preStart(): Unit = { initStorage() } @@ -159,7 +159,7 @@ class CounterService extends Actor { * failing. When it has been stopped we will schedule a Reconnect after a delay. * Watch the child so we receive Terminated message when it has been terminated. */ - def initStorage() { + def initStorage(): Unit = { storage = Some(context.watch(context.actorOf(Props[Storage], name = "storage"))) // Tell the counter, if any, to use the new storage counter foreach { _ ! UseStorage(storage) } @@ -197,7 +197,7 @@ class CounterService extends Actor { initStorage() } - def forwardOrPlaceInBacklog(msg: Any) { + def forwardOrPlaceInBacklog(msg: Any): Unit = { // We need the initial value from storage before we can start delegate to // the counter. Before that we place the messages in a backlog, to be sent // to the counter when it is initialized. @@ -246,7 +246,7 @@ class Counter(key: String, initialValue: Long) extends Actor { } - def storeCount() { + def storeCount(): Unit = { // Delegate dangerous work, to protect our valuable state. // We can continue without storage. storage foreach { _ ! Store(Entry(key, count)) } diff --git a/akka-docs/src/test/scala/docs/actor/FaultHandlingDocSpec.scala b/akka-docs/src/test/scala/docs/actor/FaultHandlingDocSpec.scala index 016ca54bff..bd73c6582a 100644 --- a/akka-docs/src/test/scala/docs/actor/FaultHandlingDocSpec.scala +++ b/akka-docs/src/test/scala/docs/actor/FaultHandlingDocSpec.scala @@ -62,7 +62,7 @@ object FaultHandlingDocSpec { case p: Props ⇒ sender() ! context.actorOf(p) } // override default to kill all children during restart - override def preRestart(cause: Throwable, msg: Option[Any]) {} + override def preRestart(cause: Throwable, msg: Option[Any]): Unit = {} } //#supervisor2 @@ -113,7 +113,7 @@ class FaultHandlingDocSpec(_system: ActorSystem) extends TestKit(_system) } """))) - override def afterAll { + override def afterAll: Unit = { TestKit.shutdownActorSystem(system) } diff --git a/akka-docs/src/test/scala/docs/actor/UnnestedReceives.scala b/akka-docs/src/test/scala/docs/actor/UnnestedReceives.scala index 7fcc9a99a2..a85464bbe3 100644 --- a/akka-docs/src/test/scala/docs/actor/UnnestedReceives.scala +++ b/akka-docs/src/test/scala/docs/actor/UnnestedReceives.scala @@ -22,11 +22,11 @@ class UnnestedReceives extends Actor { //This message processes a message/event def process(msg: Any): Unit = println("processing: " + msg) //This method subscribes the actor to the event bus - def subscribe() {} //Your external stuff + def subscribe(): Unit = {} //Your external stuff //This method retrieves all prior messages/events def allOldMessages() = List() - override def preStart { + override def preStart: Unit = { //We override preStart to be sure that the first message the actor gets is //'Replay, that message will start to be processed _after_ the actor is started self ! 'Replay diff --git a/akka-docs/src/test/scala/docs/camel/CustomRoute.scala b/akka-docs/src/test/scala/docs/camel/CustomRoute.scala index 5041d9b553..852b07b191 100644 --- a/akka-docs/src/test/scala/docs/camel/CustomRoute.scala +++ b/akka-docs/src/test/scala/docs/camel/CustomRoute.scala @@ -27,7 +27,7 @@ object CustomRoute { class CustomRouteBuilder(system: ActorSystem, responder: ActorRef) extends RouteBuilder { - def configure { + def configure: Unit = { from("jetty:http://localhost:8877/camel/custom").to(responder) } } @@ -52,7 +52,7 @@ object CustomRoute { override def onRouteDefinition = (rd) ⇒ rd.onException(classOf[Exception]). handled(true).transform(Builder.exceptionMessage).end - final override def preRestart(reason: Throwable, message: Option[Any]) { + final override def preRestart(reason: Throwable, message: Option[Any]): Unit = { sender() ! Failure(reason) } } diff --git a/akka-docs/src/test/scala/docs/camel/Producers.scala b/akka-docs/src/test/scala/docs/camel/Producers.scala index 070dc987b5..c85a5808c2 100644 --- a/akka-docs/src/test/scala/docs/camel/Producers.scala +++ b/akka-docs/src/test/scala/docs/camel/Producers.scala @@ -45,7 +45,7 @@ object Producers { class Forwarder(uri: String, target: ActorRef) extends Actor with Producer { def endpointUri = uri - override def routeResponse(msg: Any) { target forward msg } + override def routeResponse(msg: Any): Unit = { target forward msg } } val system = ActorSystem("some-system") val receiver = system.actorOf(Props[ResponseReceiver]) diff --git a/akka-docs/src/test/scala/docs/dispatcher/MyUnboundedMailbox.scala b/akka-docs/src/test/scala/docs/dispatcher/MyUnboundedMailbox.scala index 32c302b367..07b7fb0067 100644 --- a/akka-docs/src/test/scala/docs/dispatcher/MyUnboundedMailbox.scala +++ b/akka-docs/src/test/scala/docs/dispatcher/MyUnboundedMailbox.scala @@ -28,7 +28,7 @@ object MyUnboundedMailbox { def dequeue(): Envelope = queue.poll() def numberOfMessages: Int = queue.size def hasMessages: Boolean = !queue.isEmpty - def cleanUp(owner: ActorRef, deadLetters: MessageQueue) { + def cleanUp(owner: ActorRef, deadLetters: MessageQueue): Unit = { while (hasMessages) { deadLetters.enqueue(owner, dequeue()) } diff --git a/akka-docs/src/test/scala/docs/event/LoggingDocSpec.scala b/akka-docs/src/test/scala/docs/event/LoggingDocSpec.scala index 7ae196b364..fa4c74c7d8 100644 --- a/akka-docs/src/test/scala/docs/event/LoggingDocSpec.scala +++ b/akka-docs/src/test/scala/docs/event/LoggingDocSpec.scala @@ -17,7 +17,7 @@ object LoggingDocSpec { override def preStart() = { log.debug("Starting") } - override def preRestart(reason: Throwable, message: Option[Any]) { + override def preRestart(reason: Throwable, message: Option[Any]): Unit = { log.error(reason, "Restarting due to [{}] when processing [{}]", reason.getMessage, message.getOrElse("")) } diff --git a/akka-docs/src/test/scala/docs/io/ScalaUdpMulticast.scala b/akka-docs/src/test/scala/docs/io/ScalaUdpMulticast.scala index 2a30806e14..4b25d8455b 100644 --- a/akka-docs/src/test/scala/docs/io/ScalaUdpMulticast.scala +++ b/akka-docs/src/test/scala/docs/io/ScalaUdpMulticast.scala @@ -22,7 +22,7 @@ final case class Inet6ProtocolFamily() extends DatagramChannelCreator { //#multicast-group final case class MulticastGroup(address: String, interface: String) extends SocketOptionV2 { - override def afterBind(s: DatagramSocket) { + override def afterBind(s: DatagramSocket): Unit = { val group = InetAddress.getByName(address) val networkInterface = NetworkInterface.getByName(interface) s.getChannel.join(group, networkInterface) diff --git a/akka-docs/src/test/scala/docs/persistence/PersistencePluginDocSpec.scala b/akka-docs/src/test/scala/docs/persistence/PersistencePluginDocSpec.scala index 2f17159fc0..dfecf26119 100644 --- a/akka-docs/src/test/scala/docs/persistence/PersistencePluginDocSpec.scala +++ b/akka-docs/src/test/scala/docs/persistence/PersistencePluginDocSpec.scala @@ -234,12 +234,12 @@ object PersistenceTCKDoc { new File(system.settings.config.getString("akka.persistence.journal.leveldb.dir")), new File(config.getString("akka.persistence.snapshot-store.local.dir"))) - override def beforeAll() { + override def beforeAll(): Unit = { super.beforeAll() storageLocations foreach FileUtils.deleteRecursively } - override def afterAll() { + override def afterAll(): Unit = { storageLocations foreach FileUtils.deleteRecursively super.afterAll() } diff --git a/akka-docs/src/test/scala/docs/remoting/RemoteDeploymentDocSpec.scala b/akka-docs/src/test/scala/docs/remoting/RemoteDeploymentDocSpec.scala index ae55afdc62..295c3cb785 100644 --- a/akka-docs/src/test/scala/docs/remoting/RemoteDeploymentDocSpec.scala +++ b/akka-docs/src/test/scala/docs/remoting/RemoteDeploymentDocSpec.scala @@ -31,7 +31,7 @@ class RemoteDeploymentDocSpec extends AkkaSpec(""" val other = ActorSystem("remote", system.settings.config) val address = other.asInstanceOf[ExtendedActorSystem].provider.getExternalAddressFor(Address("akka.tcp", "s", "host", 1)).get - override def afterTermination() { shutdown(other) } + override def afterTermination(): Unit = { shutdown(other) } "demonstrate programmatic deployment" in { //#deploy diff --git a/akka-docs/src/test/scala/docs/testkit/PlainWordSpec.scala b/akka-docs/src/test/scala/docs/testkit/PlainWordSpec.scala index 59aa325d2e..0eda7c5e78 100644 --- a/akka-docs/src/test/scala/docs/testkit/PlainWordSpec.scala +++ b/akka-docs/src/test/scala/docs/testkit/PlainWordSpec.scala @@ -14,7 +14,7 @@ class MySpec() extends TestKit(ActorSystem("MySpec")) with ImplicitSender with WordSpecLike with Matchers with BeforeAndAfterAll { //#implicit-sender - override def afterAll { + override def afterAll: Unit = { TestKit.shutdownActorSystem(system) } diff --git a/akka-docs/src/test/scala/docs/testkit/TestKitUsageSpec.scala b/akka-docs/src/test/scala/docs/testkit/TestKitUsageSpec.scala index 5306ddc575..3b18843d2b 100644 --- a/akka-docs/src/test/scala/docs/testkit/TestKitUsageSpec.scala +++ b/akka-docs/src/test/scala/docs/testkit/TestKitUsageSpec.scala @@ -44,7 +44,7 @@ class TestKitUsageSpec val seqRef = system.actorOf(Props(classOf[SequencingActor], testActor, headList, tailList)) - override def afterAll { + override def afterAll: Unit = { shutdown() } diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Conductor.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Conductor.scala index f11c7f86cd..221d0258cd 100644 --- a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Conductor.scala +++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Conductor.scala @@ -478,7 +478,7 @@ private[akka] class Controller(private var initialParticipants: Int, controllerP case GetSockAddr ⇒ sender() ! connection.getLocalAddress } - override def postStop() { + override def postStop(): Unit = { RemoteConnection.shutdown(connection) } } @@ -533,8 +533,8 @@ private[akka] class BarrierCoordinator extends Actor with LoggingFSM[BarrierCoor // this shall be set to true if all subsequent barriers shall fail var failed = false - override def preRestart(reason: Throwable, message: Option[Any]) {} - override def postRestart(reason: Throwable) { failed = true } + override def preRestart(reason: Throwable, message: Option[Any]): Unit = {} + override def postRestart(reason: Throwable): Unit = { failed = true } // TODO what happens with the other waiting players in case of a test failure? diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala index 1f94de1804..909c643be0 100644 --- a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala +++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala @@ -91,7 +91,7 @@ trait Player { this: TestConductorExt ⇒ * Enter the named barriers, one after the other, in the order given. Will * throw an exception in case of timeouts or other errors. */ - def enter(timeout: Timeout, name: immutable.Seq[String]) { + def enter(timeout: Timeout, name: immutable.Seq[String]): Unit = { system.log.debug("entering barriers " + name.mkString("(", ", ", ")")) val stop = Deadline.now + timeout.duration name foreach { b ⇒ diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala index f6f0f02763..b269d6d945 100644 --- a/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala +++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala @@ -295,11 +295,11 @@ abstract class MultiNodeSpec(val myself: RoleName, _system: ActorSystem, _roles: def await: T = Await.result(w, remainingOr(testConductor.Settings.QueryTimeout.duration)) } - final override def multiNodeSpecBeforeAll { + final override def multiNodeSpecBeforeAll: Unit = { atStartup() } - final override def multiNodeSpecAfterAll { + final override def multiNodeSpecAfterAll: Unit = { // wait for all nodes to remove themselves before we shut the conductor down if (selfIndex == 0) { testConductor.removeNode(myself) diff --git a/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala b/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala index 9b7318467c..a90a7c5cbb 100644 --- a/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala +++ b/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala @@ -51,9 +51,9 @@ abstract class ActorSystemActivator extends BundleActivator { * @param context the BundleContext * @param system the ActorSystem to be advertised */ - def addLogServiceListener(context: BundleContext, system: ActorSystem) { + def addLogServiceListener(context: BundleContext, system: ActorSystem): Unit = { val logServiceListner = new ServiceListener { - def serviceChanged(event: ServiceEvent) { + def serviceChanged(event: ServiceEvent): Unit = { event.getType match { case ServiceEvent.REGISTERED ⇒ system.eventStream.publish(serviceForReference[LogService](context, event.getServiceReference)) diff --git a/akka-osgi/src/main/scala/akka/osgi/DefaultOSGiLogger.scala b/akka-osgi/src/main/scala/akka/osgi/DefaultOSGiLogger.scala index a2846fa5dd..55e7fd8969 100644 --- a/akka-osgi/src/main/scala/akka/osgi/DefaultOSGiLogger.scala +++ b/akka-osgi/src/main/scala/akka/osgi/DefaultOSGiLogger.scala @@ -34,7 +34,7 @@ class DefaultOSGiLogger extends DefaultLogger { * * @param logService OSGi LogService that has been registered, */ - def setLogService(logService: LogService) { + def setLogService(logService: LogService): Unit = { messagesToLog.foreach(x ⇒ { logMessage(logService, x) }) @@ -68,7 +68,7 @@ class DefaultOSGiLogger extends DefaultLogger { * @param logService OSGi LogService registered and used for logging * @param event akka LogEvent that is logged using the LogService */ - def logMessage(logService: LogService, event: LogEvent) { + def logMessage(logService: LogService, event: LogEvent): Unit = { event match { case error: Logging.Error if error.cause != NoCause ⇒ logService.log(event.level.asInt, messageFormat.format(timestamp(event), event.thread.getName, event.logSource, event.message), error.cause) diff --git a/akka-osgi/src/test/scala/akka/osgi/test/TestActivators.scala b/akka-osgi/src/test/scala/akka/osgi/test/TestActivators.scala index 957c0822fd..7e64d2f923 100644 --- a/akka-osgi/src/test/scala/akka/osgi/test/TestActivators.scala +++ b/akka-osgi/src/test/scala/akka/osgi/test/TestActivators.scala @@ -23,7 +23,7 @@ object TestActivators { */ class PingPongActorSystemActivator extends ActorSystemActivator { - def configure(context: BundleContext, system: ActorSystem) { + def configure(context: BundleContext, system: ActorSystem): Unit = { system.actorOf(Props[PongActor], name = "pong") registerService(context, system) } diff --git a/akka-osgi/src/test/scala/docs/osgi/Activator.scala b/akka-osgi/src/test/scala/docs/osgi/Activator.scala index 780710150c..5b0218dcf2 100644 --- a/akka-osgi/src/test/scala/docs/osgi/Activator.scala +++ b/akka-osgi/src/test/scala/docs/osgi/Activator.scala @@ -17,7 +17,7 @@ import akka.osgi.ActorSystemActivator class Activator extends ActorSystemActivator { - def configure(context: BundleContext, system: ActorSystem) { + def configure(context: BundleContext, system: ActorSystem): Unit = { // optionally register the ActorSystem in the OSGi Service Registry registerService(context, system) diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/Cleanup.scala b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/Cleanup.scala index b4f8592b61..063f05c0aa 100644 --- a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/Cleanup.scala +++ b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/Cleanup.scala @@ -14,11 +14,11 @@ trait Cleanup { this: AkkaSpec ⇒ "akka.persistence.journal.leveldb-shared.store.dir", "akka.persistence.snapshot-store.local.dir").map(s ⇒ new File(system.settings.config.getString(s))) - override protected def atStartup() { + override protected def atStartup(): Unit = { storageLocations.foreach(FileUtils.deleteDirectory) } - override protected def afterTermination() { + override protected def afterTermination(): Unit = { storageLocations.foreach(FileUtils.deleteDirectory) } } diff --git a/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/PersistencePluginProxySpec.scala b/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/PersistencePluginProxySpec.scala index 3c3e3d67fa..7b49b46ede 100644 --- a/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/PersistencePluginProxySpec.scala +++ b/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/PersistencePluginProxySpec.scala @@ -89,7 +89,7 @@ class PersistencePluginProxySpec extends AkkaSpec(PersistencePluginProxySpec.sta val systemA = ActorSystem("SysA", config) val systemB = ActorSystem("SysB", targetAddressConfig(system) withFallback PersistencePluginProxySpec.config) - override protected def afterTermination() { + override protected def afterTermination(): Unit = { shutdown(systemA) shutdown(systemB) super.afterTermination() diff --git a/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala b/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala index cdddf3cecb..7c0656f6aa 100644 --- a/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala +++ b/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala @@ -71,7 +71,7 @@ class SharedLeveldbJournalSpec extends AkkaSpec(SharedLeveldbJournalSpec.config) val systemA = ActorSystem("SysA", system.settings.config) val systemB = ActorSystem("SysB", system.settings.config) - override protected def afterTermination() { + override protected def afterTermination(): Unit = { shutdown(systemA) shutdown(systemB) super.afterTermination() diff --git a/akka-persistence-shared/src/test/scala/akka/persistence/serialization/SerializerSpec.scala b/akka-persistence-shared/src/test/scala/akka/persistence/serialization/SerializerSpec.scala index a3b5e3d91e..c0241868ce 100644 --- a/akka-persistence-shared/src/test/scala/akka/persistence/serialization/SerializerSpec.scala +++ b/akka-persistence-shared/src/test/scala/akka/persistence/serialization/SerializerSpec.scala @@ -326,11 +326,11 @@ class MessageSerializerRemotingSpec extends AkkaSpec(remote.withFallback(customS val serialization = SerializationExtension(system) - override protected def atStartup() { + override protected def atStartup(): Unit = { remoteSystem.actorOf(Props[RemoteActor], "remote") } - override def afterTermination() { + override def afterTermination(): Unit = { Await.ready(remoteSystem.terminate(), Duration.Inf) } diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/scalatest/MayVerb.scala b/akka-persistence-tck/src/main/scala/akka/persistence/scalatest/MayVerb.scala index 2a17715a1c..711868a36c 100644 --- a/akka-persistence-tck/src/main/scala/akka/persistence/scalatest/MayVerb.scala +++ b/akka-persistence-tck/src/main/scala/akka/persistence/scalatest/MayVerb.scala @@ -39,7 +39,7 @@ trait MayVerb { * * @see RFC 2119 */ - def may(right: ⇒ Unit)(implicit fun: StringVerbBlockRegistration, pos: Position) { + def may(right: ⇒ Unit)(implicit fun: StringVerbBlockRegistration, pos: Position): Unit = { fun(leftSideString, "may", pos, right _) } } diff --git a/akka-persistence-tck/src/test/scala/akka/persistence/PluginCleanup.scala b/akka-persistence-tck/src/test/scala/akka/persistence/PluginCleanup.scala index 1d23a479e1..75d0217196 100644 --- a/akka-persistence-tck/src/test/scala/akka/persistence/PluginCleanup.scala +++ b/akka-persistence-tck/src/test/scala/akka/persistence/PluginCleanup.scala @@ -13,12 +13,12 @@ trait PluginCleanup extends BeforeAndAfterAll { _: PluginSpec ⇒ "akka.persistence.journal.leveldb.dir", "akka.persistence.snapshot-store.local.dir").map(s ⇒ new File(system.settings.config.getString(s))) - override def beforeAll() { + override def beforeAll(): Unit = { storageLocations.foreach(FileUtils.deleteDirectory) super.beforeAll() } - override def afterAll() { + override def afterAll(): Unit = { super.afterAll() storageLocations.foreach(FileUtils.deleteDirectory) } diff --git a/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala b/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala index 1ada334605..739a6dd9df 100644 --- a/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala +++ b/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala @@ -453,7 +453,7 @@ private[persistence] trait Eventsourced extends Snapshotter with PersistenceStas } } - override def unstashAll() { + override def unstashAll(): Unit = { // Internally, all messages are processed by unstashing them from // the internal stash one-by-one. Hence, an unstashAll() from the // user stash must be prepended to the internal stash. @@ -656,7 +656,7 @@ private[persistence] trait Eventsourced extends Snapshotter with PersistenceStas } } - private def flushBatch() { + private def flushBatch(): Unit = { if (eventBatch.nonEmpty) { journalBatch ++= eventBatch.reverse eventBatch = Nil diff --git a/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSMBase.scala b/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSMBase.scala index 9897d23914..2222d268a0 100644 --- a/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSMBase.scala +++ b/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSMBase.scala @@ -282,7 +282,7 @@ trait PersistentFSMBase[S, D, E] extends Actor with Listeners with ActorLogging implicit final def total2pf(transitionHandler: (S, S) ⇒ Unit): TransitionHandler = new TransitionHandler { def isDefinedAt(in: (S, S)) = true - def apply(in: (S, S)) { transitionHandler(in._1, in._2) } + def apply(in: (S, S)): Unit = { transitionHandler(in._1, in._2) } } /** @@ -398,7 +398,7 @@ trait PersistentFSMBase[S, D, E] extends Actor with Listeners with ActorLogging * transition handling */ private var transitionEvent: List[TransitionHandler] = Nil - private def handleTransition(prev: S, next: S) { + private def handleTransition(prev: S, next: S): Unit = { val tuple = (prev, next) for (te ← transitionEvent) { if (te.isDefinedAt(tuple)) te(tuple) } } @@ -563,7 +563,7 @@ trait LoggingPersistentFSM[S, D, E] extends PersistentFSMBase[S, D, E] { this: A private var pos = 0 private var full = false - private def advance() { + private def advance(): Unit = { val n = pos + 1 if (n == logDepth) { full = true diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteJournal.scala b/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteJournal.scala index 971a64c69d..3d78855f0f 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteJournal.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteJournal.scala @@ -280,7 +280,7 @@ private[persistence] object AsyncWriteJournal { } @scala.annotation.tailrec - private def resequence(d: Desequenced) { + private def resequence(d: Desequenced): Unit = { if (d.snr == delivered + 1) { delivered = d.snr d.target.tell(d.msg, d.sender) diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbIdMapping.scala b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbIdMapping.scala index d8468eca2f..64d0306d26 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbIdMapping.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbIdMapping.scala @@ -69,7 +69,7 @@ private[persistence] trait LeveldbIdMapping extends Actor { this: LeveldbStore protected def newPersistenceIdAdded(id: String): Unit = () - override def preStart() { + override def preStart(): Unit = { idMap = readIdMap() super.preStart() } diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbRecovery.scala b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbRecovery.scala index 8289b23a68..8dc87cd6aa 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbRecovery.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbRecovery.scala @@ -34,7 +34,7 @@ private[persistence] trait LeveldbRecovery extends AsyncRecovery { this: Leveldb def replayMessages(persistenceId: Int, fromSequenceNr: Long, toSequenceNr: Long, max: Long)(replayCallback: PersistentRepr ⇒ Unit): Unit = { @scala.annotation.tailrec - def go(iter: DBIterator, key: Key, ctr: Long, replayCallback: PersistentRepr ⇒ Unit) { + def go(iter: DBIterator, key: Key, ctr: Long, replayCallback: PersistentRepr ⇒ Unit): Unit = { if (iter.hasNext) { val nextEntry = iter.next() val nextKey = keyFromBytes(nextEntry.getKey) @@ -83,7 +83,7 @@ private[persistence] trait LeveldbRecovery extends AsyncRecovery { this: Leveldb replayCallback: ReplayedTaggedMessage ⇒ Unit): Unit = { @scala.annotation.tailrec - def go(iter: DBIterator, key: Key, ctr: Long, replayCallback: ReplayedTaggedMessage ⇒ Unit) { + def go(iter: DBIterator, key: Key, ctr: Long, replayCallback: ReplayedTaggedMessage ⇒ Unit): Unit = { if (iter.hasNext) { val nextEntry = iter.next() val nextKey = keyFromBytes(nextEntry.getKey) diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala index 94c9d16079..1fde2c1559 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala @@ -182,12 +182,12 @@ private[persistence] trait LeveldbStore extends Actor with WriteJournalBase with def tagAsPersistenceId(tag: String): String = tagPersistenceIdPrefix + tag - override def preStart() { + override def preStart(): Unit = { leveldb = leveldbFactory.open(leveldbDir, if (nativeLeveldb) leveldbOptions else leveldbOptions.compressionType(CompressionType.NONE)) super.preStart() } - override def postStop() { + override def postStop(): Unit = { leveldb.close() super.postStop() } diff --git a/akka-persistence/src/main/scala/akka/persistence/snapshot/local/LocalSnapshotStore.scala b/akka-persistence/src/main/scala/akka/persistence/snapshot/local/LocalSnapshotStore.scala index b01dd4113d..696fa59ba9 100644 --- a/akka-persistence/src/main/scala/akka/persistence/snapshot/local/LocalSnapshotStore.scala +++ b/akka-persistence/src/main/scala/akka/persistence/snapshot/local/LocalSnapshotStore.scala @@ -148,7 +148,7 @@ private[persistence] class LocalSnapshotStore(config: Config) extends SnapshotSt } } - override def preStart() { + override def preStart(): Unit = { snapshotDir() super.preStart() } diff --git a/akka-persistence/src/test/scala/akka/persistence/EndToEndEventAdapterSpec.scala b/akka-persistence/src/test/scala/akka/persistence/EndToEndEventAdapterSpec.scala index 52ca630896..86aebbe21f 100644 --- a/akka-persistence/src/test/scala/akka/persistence/EndToEndEventAdapterSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/EndToEndEventAdapterSpec.scala @@ -100,11 +100,11 @@ abstract class EndToEndEventAdapterSpec(journalName: String, journalConfig: Conf val storageLocations = List("akka.persistence.journal.leveldb.dir") .map(s ⇒ new File(journalConfig.getString(s))) - override protected def beforeAll() { + override protected def beforeAll(): Unit = { storageLocations.foreach(FileUtils.deleteDirectory) } - override protected def afterAll() { + override protected def afterAll(): Unit = { storageLocations.foreach(FileUtils.deleteDirectory) } diff --git a/akka-persistence/src/test/scala/akka/persistence/PersistenceSpec.scala b/akka-persistence/src/test/scala/akka/persistence/PersistenceSpec.scala index 00f7cd55e2..ee6b0104f9 100644 --- a/akka-persistence/src/test/scala/akka/persistence/PersistenceSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/PersistenceSpec.scala @@ -50,7 +50,7 @@ abstract class PersistenceSpec(config: Config) extends AkkaSpec(config) with Bef def namedPersistentActorWithProvidedConfig[T <: NamedPersistentActor: ClassTag](providedConfig: Config) = system.actorOf(Props(implicitly[ClassTag[T]].runtimeClass, name, providedConfig)) - override protected def beforeEach() { + override protected def beforeEach(): Unit = { _name = s"${namePrefix}-${counter.incrementAndGet()}" } } @@ -78,11 +78,11 @@ trait Cleanup { this: AkkaSpec ⇒ "akka.persistence.journal.leveldb-shared.store.dir", "akka.persistence.snapshot-store.local.dir").map(s ⇒ new File(system.settings.config.getString(s))) - override protected def atStartup() { + override protected def atStartup(): Unit = { storageLocations.foreach(FileUtils.deleteDirectory) } - override protected def afterTermination() { + override protected def afterTermination(): Unit = { storageLocations.foreach(FileUtils.deleteDirectory) } } diff --git a/akka-persistence/src/test/scala/akka/persistence/PersistentActorSpec.scala b/akka-persistence/src/test/scala/akka/persistence/PersistentActorSpec.scala index 32561869aa..e1caa3230c 100644 --- a/akka-persistence/src/test/scala/akka/persistence/PersistentActorSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/PersistentActorSpec.scala @@ -919,7 +919,7 @@ abstract class PersistentActorSpec(config: Config) extends PersistenceSpec(confi import PersistentActorSpec._ - override protected def beforeEach() { + override protected def beforeEach(): Unit = { super.beforeEach() val persistentActor = behavior1PersistentActor diff --git a/akka-persistence/src/test/scala/akka/persistence/SnapshotDirectoryFailureSpec.scala b/akka-persistence/src/test/scala/akka/persistence/SnapshotDirectoryFailureSpec.scala index 49b995656e..60a0590ff5 100644 --- a/akka-persistence/src/test/scala/akka/persistence/SnapshotDirectoryFailureSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/SnapshotDirectoryFailureSpec.scala @@ -38,11 +38,11 @@ class SnapshotDirectoryFailureSpec extends AkkaSpec(PersistenceSpec.config("leve val file = new File(inUseSnapshotPath) - override protected def atStartup() { + override protected def atStartup(): Unit = { if (!file.createNewFile()) throw new IOException(s"Failed to create test file [${file.getCanonicalFile}]") } - override protected def afterTermination() { + override protected def afterTermination(): Unit = { if (!file.delete()) throw new IOException(s"Failed to delete test file [${file.getCanonicalFile}]") } diff --git a/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryLocalStoreSpec.scala b/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryLocalStoreSpec.scala index 6bedc32a50..cf294292cb 100644 --- a/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryLocalStoreSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryLocalStoreSpec.scala @@ -43,7 +43,7 @@ class SnapshotRecoveryLocalStoreSpec extends PersistenceSpec(PersistenceSpec.con import SnapshotRecoveryLocalStoreSpec._ - override protected def beforeEach() { + override protected def beforeEach(): Unit = { super.beforeEach() val persistentActor1 = system.actorOf(Props(classOf[SaveSnapshotTestPersistentActor], persistenceId, testActor)) diff --git a/akka-persistence/src/test/scala/akka/persistence/SnapshotSpec.scala b/akka-persistence/src/test/scala/akka/persistence/SnapshotSpec.scala index 987581c419..904b80e383 100644 --- a/akka-persistence/src/test/scala/akka/persistence/SnapshotSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/SnapshotSpec.scala @@ -83,7 +83,7 @@ class SnapshotSpec extends PersistenceSpec(PersistenceSpec.config("leveldb", "Sn import SnapshotSpec._ import SnapshotProtocol._ - override protected def beforeEach() { + override protected def beforeEach(): Unit = { super.beforeEach() val persistentActor = system.actorOf(Props(classOf[SaveSnapshotTestPersistentActor], name, testActor)) diff --git a/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala b/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala index 90baa18cee..29a9f33847 100644 --- a/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala +++ b/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala @@ -552,7 +552,7 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender { expectMsgType[ActorRef] } - private def noMsg(probes: TestProbe*) { + private def noMsg(probes: TestProbe*): Unit = { expectNoMsg(1 second) probes foreach (_.msgAvailable should ===(false)) } diff --git a/akka-remote/src/main/scala/akka/remote/Remoting.scala b/akka-remote/src/main/scala/akka/remote/Remoting.scala index 943796f566..754db05306 100644 --- a/akka-remote/src/main/scala/akka/remote/Remoting.scala +++ b/akka-remote/src/main/scala/akka/remote/Remoting.scala @@ -466,7 +466,7 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends var pendingReadHandoffs = Map[ActorRef, AkkaProtocolHandle]() var stashedInbound = Map[ActorRef, Vector[InboundAssociation]]() - def handleStashedInbound(endpoint: ActorRef, writerIsIdle: Boolean) { + def handleStashedInbound(endpoint: ActorRef, writerIsIdle: Boolean): Unit = { val stashed = stashedInbound.getOrElse(endpoint, Vector.empty) stashedInbound -= endpoint stashed foreach (handleInboundAssociation(_, writerIsIdle)) diff --git a/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala index 83a35faadc..beb28a90ce 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala @@ -36,12 +36,12 @@ akka { val other = ActorSystem("other", ConfigFactory.parseString("akka.remote.netty.tcp.port=2666") .withFallback(system.settings.config)) - override def beforeTermination() { + override def beforeTermination(): Unit = { system.eventStream.publish(TestEvent.Mute( EventFilter.warning(pattern = "received dead letter.*Disassociate"))) } - override def afterTermination() { + override def afterTermination(): Unit = { shutdown(other) } diff --git a/akka-remote/src/test/scala/akka/remote/RemoteDeploymentWhitelistSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteDeploymentWhitelistSpec.scala index 2815868611..3861fbf369 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteDeploymentWhitelistSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteDeploymentWhitelistSpec.scala @@ -21,12 +21,12 @@ object RemoteDeploymentWhitelistSpec { case x ⇒ target = sender(); sender() ! x } - override def preStart() {} - override def preRestart(cause: Throwable, msg: Option[Any]) { + override def preStart(): Unit = {} + override def preRestart(cause: Throwable, msg: Option[Any]): Unit = { target ! "preRestart" } - override def postRestart(cause: Throwable) {} - override def postStop() { + override def postRestart(cause: Throwable): Unit = {} + override def postStop(): Unit = { target ! "postStop" } } @@ -39,12 +39,12 @@ object RemoteDeploymentWhitelistSpec { case x ⇒ target = sender(); sender() ! x } - override def preStart() {} - override def preRestart(cause: Throwable, msg: Option[Any]) { + override def preStart(): Unit = {} + override def preRestart(cause: Throwable, msg: Option[Any]): Unit = { target ! "preRestart" } - override def postRestart(cause: Throwable) {} - override def postStop() { + override def postRestart(cause: Throwable): Unit = {} + override def postStop(): Unit = { target ! "postStop" } } @@ -81,7 +81,7 @@ object RemoteDeploymentWhitelistSpec { } """) - def muteSystem(system: ActorSystem) { + def muteSystem(system: ActorSystem): Unit = { system.eventStream.publish(TestEvent.Mute( EventFilter.error(start = "AssociationError"), EventFilter.warning(start = "AssociationError"), @@ -121,7 +121,7 @@ class RemoteDeploymentWhitelistSpec extends AkkaSpec(RemoteDeploymentWhitelistSp EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate|HandleListener)"))) } - override def afterTermination() { + override def afterTermination(): Unit = { shutdown(remoteSystem) AssociationRegistry.clear() } diff --git a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala index c2f63679dc..ea78337702 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala @@ -89,7 +89,7 @@ class RemoteRouterSpec extends AkkaSpec(s""" }""").withFallback(system.settings.config) val masterSystem = ActorSystem(masterSystemName, conf) - override def afterTermination() { + override def afterTermination(): Unit = { shutdown(masterSystem) } diff --git a/akka-remote/src/test/scala/akka/remote/RemoteWatcherSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteWatcherSpec.scala index 6fd836c9ff..bdd8b7cd8a 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteWatcherSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteWatcherSpec.scala @@ -87,7 +87,7 @@ class RemoteWatcherSpec extends AkkaSpec( akka.remote.transport.AssociationHandle.Disassociated.getClass, akka.remote.transport.ActorTransportAdapter.DisassociateUnderlying.getClass)(_)) - override def afterTermination() { + override def afterTermination(): Unit = { shutdown(remoteSystem) } diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala index d1f378a2c7..a0e7465575 100644 --- a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala @@ -39,12 +39,12 @@ object RemotingSpec { case x ⇒ target = sender(); sender() ! x } - override def preStart() {} - override def preRestart(cause: Throwable, msg: Option[Any]) { + override def preStart(): Unit = {} + override def preRestart(cause: Throwable, msg: Option[Any]): Unit = { target ! "preRestart" } - override def postRestart(cause: Throwable) {} - override def postStop() { + override def postRestart(cause: Throwable): Unit = {} + override def postStop(): Unit = { target ! "postStop" } } @@ -122,7 +122,7 @@ object RemotingSpec { } """) - def muteSystem(system: ActorSystem) { + def muteSystem(system: ActorSystem): Unit = { system.eventStream.publish(TestEvent.Mute( EventFilter.error(start = "AssociationError"), EventFilter.warning(start = "AssociationError"), @@ -153,7 +153,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D def getOtherAddress(sys: ActorSystem, proto: String) = sys.asInstanceOf[ExtendedActorSystem].provider.getExternalAddressFor(Address(s"akka.$proto", "", "", 0)).get def port(sys: ActorSystem, proto: String) = getOtherAddress(sys, proto).port.get - def deploy(sys: ActorSystem, d: Deploy) { + def deploy(sys: ActorSystem, d: Deploy): Unit = { sys.asInstanceOf[ExtendedActorSystem].provider.asInstanceOf[RemoteActorRefProvider].deployer.deploy(d) } @@ -161,7 +161,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D val here = system.actorFor("akka.test://remote-sys@localhost:12346/user/echo") - private def verifySend(msg: Any)(afterSend: ⇒ Unit) { + private def verifySend(msg: Any)(afterSend: ⇒ Unit): Unit = { val bigBounceId = s"bigBounce-${ThreadLocalRandom.current.nextInt()}" val bigBounceOther = remoteSystem.actorOf(Props(new Actor { def receive = { @@ -202,7 +202,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D val maxPayloadBytes = system.settings.config.getBytes("akka.remote.test.maximum-payload-bytes").toInt - override def afterTermination() { + override def afterTermination(): Unit = { shutdown(remoteSystem) AssociationRegistry.clear() } diff --git a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala index 6bd98864dd..a79adb4fc0 100644 --- a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala @@ -108,7 +108,7 @@ abstract class Ticket1978CommunicationSpec(val cipherConfig: CipherConfig) exten "remote-sys", ConfigFactory.parseString("akka.remote.netty.ssl.port = " + cipherConfig.remotePort).withFallback(system.settings.config)) - override def afterTermination() { + override def afterTermination(): Unit = { if (cipherConfig.runTest) { shutdown(other) } diff --git a/akka-remote/src/test/scala/akka/remote/TypedActorRemoteDeploySpec.scala b/akka-remote/src/test/scala/akka/remote/TypedActorRemoteDeploySpec.scala index 87c5ee6d64..56f86b1cfc 100644 --- a/akka-remote/src/test/scala/akka/remote/TypedActorRemoteDeploySpec.scala +++ b/akka-remote/src/test/scala/akka/remote/TypedActorRemoteDeploySpec.scala @@ -58,7 +58,7 @@ class TypedActorRemoteDeploySpec extends AkkaSpec(conf) { } - override def afterTermination() { + override def afterTermination(): Unit = { shutdown(remoteSystem) } diff --git a/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala b/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala index 08d2da6c0a..412e429bd5 100644 --- a/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala @@ -92,7 +92,7 @@ akka.loglevel = DEBUG # test verifies debug p.expectMsgType[ActorIdentity].ref.get } - override def afterTermination() { + override def afterTermination(): Unit = { shutdown(client) } diff --git a/akka-remote/src/test/scala/akka/remote/artery/BindCanonicalAddressSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/BindCanonicalAddressSpec.scala index 456fddc23c..e01fa9f10a 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/BindCanonicalAddressSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/BindCanonicalAddressSpec.scala @@ -18,7 +18,7 @@ import java.net.InetAddress trait BindCanonicalAddressBehaviors { this: WordSpec with Matchers ⇒ - def arteryConnectionTest(transport: String, isUDP: Boolean) { + def arteryConnectionTest(transport: String, isUDP: Boolean): Unit = { val commonConfig = BindCanonicalAddressSpec.commonConfig(transport) diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteConnectionSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteConnectionSpec.scala index 0d41786716..390e71ec70 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteConnectionSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteConnectionSpec.scala @@ -12,7 +12,7 @@ import scala.concurrent.duration._ class RemoteConnectionSpec extends ArteryMultiNodeSpec("akka.remote.retry-gate-closed-for = 5s") with ImplicitSender { - def muteSystem(system: ActorSystem) { + def muteSystem(system: ActorSystem): Unit = { system.eventStream.publish(TestEvent.Mute( EventFilter.error(start = "AssociationError"), EventFilter.warning(start = "AssociationError"), diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteDeploymentSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteDeploymentSpec.scala index 92b465f866..e6441f4fc3 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteDeploymentSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteDeploymentSpec.scala @@ -18,12 +18,12 @@ object RemoteDeploymentSpec { case x ⇒ target = sender(); sender() ! x } - override def preStart() {} - override def preRestart(cause: Throwable, msg: Option[Any]) { + override def preStart(): Unit = {} + override def preRestart(cause: Throwable, msg: Option[Any]): Unit = { target ! "preRestart" } - override def postRestart(cause: Throwable) {} - override def postStop() { + override def postRestart(cause: Throwable): Unit = {} + override def postStop(): Unit = { target ! "postStop" } } diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteMessageSerializationSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteMessageSerializationSpec.scala index d24d18d6ae..ca00c97aec 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteMessageSerializationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteMessageSerializationSpec.scala @@ -82,7 +82,7 @@ class RemoteMessageSerializationSpec extends ArteryMultiNodeSpec(""" } - private def verifySend(msg: Any)(afterSend: ⇒ Unit) { + private def verifySend(msg: Any)(afterSend: ⇒ Unit): Unit = { val bigBounceId = s"bigBounce-${ThreadLocalRandom.current.nextInt()}" val bigBounceOther = remoteSystem.actorOf(Props(new Actor { def receive = { diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteWatcherSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteWatcherSpec.scala index ca4b9e3190..63244929e8 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteWatcherSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteWatcherSpec.scala @@ -79,7 +79,7 @@ class RemoteWatcherSpec extends ArteryMultiNodeSpec(ArterySpecSupport.defaultCon akka.remote.transport.AssociationHandle.Disassociated.getClass, akka.remote.transport.ActorTransportAdapter.DisassociateUnderlying.getClass)(_)) - override def afterTermination() { + override def afterTermination(): Unit = { shutdown(remoteSystem) super.afterTermination() } diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala index e7e93b2700..83352d1f1b 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala @@ -118,7 +118,7 @@ class AkkaProtocolStressTest extends AkkaSpec(configA) with ImplicitSender with } } - override def beforeTermination() { + override def beforeTermination(): Unit = { system.eventStream.publish(TestEvent.Mute( EventFilter.warning(source = "akka://AkkaProtocolStressTest/user/$a", start = "received dead letter"), EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)"))) diff --git a/akka-remote/src/test/scala/akka/remote/transport/SystemMessageDeliveryStressTest.scala b/akka-remote/src/test/scala/akka/remote/transport/SystemMessageDeliveryStressTest.scala index 64d94afe04..b3d2ba13a8 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/SystemMessageDeliveryStressTest.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/SystemMessageDeliveryStressTest.scala @@ -177,7 +177,7 @@ abstract class SystemMessageDeliveryStressTest(msg: String, cfg: String) } } - override def beforeTermination() { + override def beforeTermination(): Unit = { system.eventStream.publish(TestEvent.Mute( EventFilter.warning(source = s"akka://AkkaProtocolStressTest/user/$$a", start = "received dead letter"), EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)"))) diff --git a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala index ca088aed15..9647095cea 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala @@ -138,7 +138,7 @@ class ThrottlerTransportAdapterSpec extends AkkaSpec(configA) with ImplicitSende } - override def beforeTermination() { + override def beforeTermination(): Unit = { system.eventStream.publish(TestEvent.Mute( EventFilter.warning(source = "akka://AkkaProtocolStressTest/user/$a", start = "received dead letter"), EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)"))) diff --git a/akka-slf4j/src/main/scala/akka/event/slf4j/Slf4jLogger.scala b/akka-slf4j/src/main/scala/akka/event/slf4j/Slf4jLogger.scala index a36836efb0..f3f5107ebe 100644 --- a/akka-slf4j/src/main/scala/akka/event/slf4j/Slf4jLogger.scala +++ b/akka-slf4j/src/main/scala/akka/event/slf4j/Slf4jLogger.scala @@ -94,7 +94,7 @@ class Slf4jLogger extends Actor with SLF4JLogging with RequiresMessageQueue[Logg } @inline - final def withMdc(logSource: String, logEvent: LogEvent)(logStatement: ⇒ Unit) { + final def withMdc(logSource: String, logEvent: LogEvent)(logStatement: ⇒ Unit): Unit = { MDC.put(mdcAkkaSourceAttributeName, logSource) MDC.put(mdcThreadAttributeName, logEvent.thread.getName) MDC.put(mdcAkkaTimestamp, formatTimestamp(logEvent.timestamp)) diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ActorPublisherTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ActorPublisherTest.scala index 24ea8c59b4..67ea654782 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ActorPublisherTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ActorPublisherTest.scala @@ -30,7 +30,7 @@ object ActorPublisherTest { case _ ⇒ // no-op } - def loopDemand() { + def loopDemand(): Unit = { val loopUntil = math.min(100, totalDemand) 1 to loopUntil.toInt foreach { _ ⇒ self ! Produce } if (loopUntil > 100) self ! Loop diff --git a/akka-stream-tests/src/test/scala/akka/stream/DslFactoriesConsistencySpec.scala b/akka-stream-tests/src/test/scala/akka/stream/DslFactoriesConsistencySpec.scala index aff7e28e03..2c0ef9551d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/DslFactoriesConsistencySpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/DslFactoriesConsistencySpec.scala @@ -153,7 +153,7 @@ class DslFactoriesConsistencySpec extends WordSpec with Matchers { case m ⇒ m } - def runSpec(sMethods: List[Method], jMethods: List[Method]) { + def runSpec(sMethods: List[Method], jMethods: List[Method]): Unit = { var warnings = 0 val results = for { diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala index 60d639295d..e7320a92e2 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala @@ -234,7 +234,7 @@ class FileSinkSpec extends StreamSpec(UnboundedMailboxConfig) { } } - private def targetFile(block: Path ⇒ Unit, create: Boolean = true) { + private def targetFile(block: Path ⇒ Unit, create: Boolean = true): Unit = { val targetFile = Files.createTempFile(fs.getPath("/"), "synchronous-file-sink", ".tmp") if (!create) Files.delete(targetFile) try block(targetFile) finally Files.delete(targetFile) diff --git a/akka-stream/src/main/scala/akka/stream/actor/ActorPublisher.scala b/akka-stream/src/main/scala/akka/stream/actor/ActorPublisher.scala index dacac9893d..e963dfb7b5 100644 --- a/akka-stream/src/main/scala/akka/stream/actor/ActorPublisher.scala +++ b/akka-stream/src/main/scala/akka/stream/actor/ActorPublisher.scala @@ -330,7 +330,7 @@ trait ActorPublisher[T] extends Actor { super.aroundReceive(receive, msg) } - private def cancelSelf() { + private def cancelSelf(): Unit = { lifecycleState = Canceled demand = 0 subscriber = null diff --git a/akka-stream/src/main/scala/akka/stream/extra/Timed.scala b/akka-stream/src/main/scala/akka/stream/extra/Timed.scala index 793aaff5d3..b2cef957a9 100644 --- a/akka-stream/src/main/scala/akka/stream/extra/Timed.scala +++ b/akka-stream/src/main/scala/akka/stream/extra/Timed.scala @@ -147,7 +147,7 @@ object Timed extends TimedOps with TimedIntervalBetweenOps { completeStage() } - private def stopTime() { + private def stopTime(): Unit = { val d = timedContext.stop() _onComplete(d) } diff --git a/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/AkkaSSLConfig.scala b/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/AkkaSSLConfig.scala index 3ad728a1a9..bdf6c29728 100644 --- a/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/AkkaSSLConfig.scala +++ b/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/AkkaSSLConfig.scala @@ -121,7 +121,7 @@ final class AkkaSSLConfig(system: ExtendedActorSystem, val config: SSLConfigSett v } - def validateDefaultTrustManager(sslConfig: SSLConfigSettings) { + def validateDefaultTrustManager(sslConfig: SSLConfigSettings): Unit = { // If we are using a default SSL context, we can't filter out certificates with weak algorithms // We ALSO don't have access to the trust manager from the SSLContext without doing horrible things // with reflection. diff --git a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala index 38f859567f..1dba5b8fe3 100644 --- a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala +++ b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala @@ -137,7 +137,7 @@ class CallingThreadDispatcher(_configurator: MessageDispatcherConfigurator) exte protected[akka] override def createMailbox(actor: akka.actor.Cell, mailboxType: MailboxType) = new CallingThreadMailbox(actor, mailboxType) - protected[akka] override def shutdown() {} + protected[akka] override def shutdown(): Unit = {} protected[akka] override def throughput = 0 protected[akka] override def throughputDeadlineTime = Duration.Zero @@ -164,14 +164,14 @@ class CallingThreadDispatcher(_configurator: MessageDispatcherConfigurator) exte mbox foreach CallingThreadDispatcherQueues(actor.system).unregisterQueues } - protected[akka] override def suspend(actor: ActorCell) { + protected[akka] override def suspend(actor: ActorCell): Unit = { actor.mailbox match { case m: CallingThreadMailbox ⇒ { m.suspendSwitch.switchOn; m.suspend() } case m ⇒ m.systemEnqueue(actor.self, Suspend()) } } - protected[akka] override def resume(actor: ActorCell) { + protected[akka] override def resume(actor: ActorCell): Unit = { actor.mailbox match { case mbox: CallingThreadMailbox ⇒ val queue = mbox.queue @@ -185,7 +185,7 @@ class CallingThreadDispatcher(_configurator: MessageDispatcherConfigurator) exte } } - protected[akka] override def systemDispatch(receiver: ActorCell, message: SystemMessage) { + protected[akka] override def systemDispatch(receiver: ActorCell, message: SystemMessage): Unit = { receiver.mailbox match { case mbox: CallingThreadMailbox ⇒ mbox.systemEnqueue(receiver.self, message) @@ -194,7 +194,7 @@ class CallingThreadDispatcher(_configurator: MessageDispatcherConfigurator) exte } } - protected[akka] override def dispatch(receiver: ActorCell, handle: Envelope) { + protected[akka] override def dispatch(receiver: ActorCell, handle: Envelope): Unit = { receiver.mailbox match { case mbox: CallingThreadMailbox ⇒ val queue = mbox.queue @@ -210,7 +210,7 @@ class CallingThreadDispatcher(_configurator: MessageDispatcherConfigurator) exte } } - protected[akka] override def executeTask(invocation: TaskInvocation) { invocation.run } + protected[akka] override def executeTask(invocation: TaskInvocation): Unit = { invocation.run } /* * This method must be called with this thread's queue. @@ -220,7 +220,7 @@ class CallingThreadDispatcher(_configurator: MessageDispatcherConfigurator) exte * it is suspendSwitch and resumed. */ @tailrec - private def runQueue(mbox: CallingThreadMailbox, queue: MessageQueue, interruptedEx: InterruptedException = null) { + private def runQueue(mbox: CallingThreadMailbox, queue: MessageQueue, interruptedEx: InterruptedException = null): Unit = { def checkThreadInterruption(intEx: InterruptedException): InterruptedException = { if (Thread.interrupted()) { // clear interrupted flag before we continue, exception will be thrown later val ie = new InterruptedException("Interrupted during message processing") diff --git a/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala b/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala index 52769bd3ce..8893b618c1 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala @@ -54,7 +54,7 @@ class TestActorRef[T <: Actor]( protected override def newActorCell(system: ActorSystemImpl, ref: InternalActorRef, props: Props, dispatcher: MessageDispatcher, supervisor: InternalActorRef): ActorCell = new ActorCell(system, ref, props, dispatcher, supervisor) { - override def autoReceiveMessage(msg: Envelope) { + override def autoReceiveMessage(msg: Envelope): Unit = { msg.message match { case InternalGetActor ⇒ sender() ! actor case _ ⇒ super.autoReceiveMessage(msg) diff --git a/akka-testkit/src/main/scala/akka/testkit/TestBarrier.scala b/akka-testkit/src/main/scala/akka/testkit/TestBarrier.scala index 8b62d250e9..7d17b3e541 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestBarrier.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestBarrier.scala @@ -28,7 +28,7 @@ class TestBarrier(count: Int) { def await()(implicit system: ActorSystem): Unit = await(TestBarrier.DefaultTimeout) - def await(timeout: FiniteDuration)(implicit system: ActorSystem) { + def await(timeout: FiniteDuration)(implicit system: ActorSystem): Unit = { try { barrier.await(timeout.dilated.toNanos, TimeUnit.NANOSECONDS) } catch { diff --git a/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala b/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala index 984063a2ba..d4de5a50c2 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala @@ -525,7 +525,7 @@ class TestEventListener extends Logging.DefaultLogger { def addFilter(filter: EventFilter): Unit = filters ::= filter - def removeFilter(filter: EventFilter) { + def removeFilter(filter: EventFilter): Unit = { @scala.annotation.tailrec def removeFirst(list: List[EventFilter], zipped: List[EventFilter] = Nil): List[EventFilter] = list match { case head :: tail if head == filter ⇒ tail.reverse_:::(zipped) diff --git a/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala b/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala index 697260668d..7cb2cc5b74 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala @@ -57,21 +57,21 @@ class TestFSMRef[S, D, T <: Actor]( * corresponding transition initiated from within the FSM, including timeout * and stop handling. */ - def setState(stateName: S = fsm.stateName, stateData: D = fsm.stateData, timeout: FiniteDuration = null, stopReason: Option[FSM.Reason] = None) { + def setState(stateName: S = fsm.stateName, stateData: D = fsm.stateData, timeout: FiniteDuration = null, stopReason: Option[FSM.Reason] = None): Unit = { fsm.applyState(FSM.State(stateName, stateData, Option(timeout), stopReason)) } /** * Proxy for [[akka.actor.FSM#setTimer]]. */ - def setTimer(name: String, msg: Any, timeout: FiniteDuration, repeat: Boolean = false) { + def setTimer(name: String, msg: Any, timeout: FiniteDuration, repeat: Boolean = false): Unit = { fsm.setTimer(name, msg, timeout, repeat) } /** * Proxy for [[akka.actor.FSM#cancelTimer]]. */ - def cancelTimer(name: String) { fsm.cancelTimer(name) } + def cancelTimer(name: String): Unit = { fsm.cancelTimer(name) } /** * Proxy for [[akka.actor.FSM#isStateTimerActive]]. diff --git a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala index dca27908a8..34c529243b 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala @@ -187,12 +187,12 @@ trait TestKitBase { * Ignore all messages in the test actor for which the given partial * function returns true. */ - def ignoreMsg(f: PartialFunction[Any, Boolean]) { testActor ! TestActor.SetIgnore(Some(f)) } + def ignoreMsg(f: PartialFunction[Any, Boolean]): Unit = { testActor ! TestActor.SetIgnore(Some(f)) } /** * Stop ignoring messages in the test actor. */ - def ignoreNoMsg() { testActor ! TestActor.SetIgnore(None) } + def ignoreNoMsg(): Unit = { testActor ! TestActor.SetIgnore(None) } /** * Have the testActor watch someone (i.e. `context.watch(...)`). @@ -270,12 +270,12 @@ trait TestKitBase { * Note that the timeout is scaled using Duration.dilated, * which uses the configuration entry "akka.test.timefactor". */ - def awaitCond(p: ⇒ Boolean, max: Duration = Duration.Undefined, interval: Duration = 100.millis, message: String = "") { + def awaitCond(p: ⇒ Boolean, max: Duration = Duration.Undefined, interval: Duration = 100.millis, message: String = ""): Unit = { val _max = remainingOrDilated(max) val stop = now + _max @tailrec - def poll(t: Duration) { + def poll(t: Duration): Unit = { if (!p) { assert(now < stop, s"timeout ${_max} expired: $message") Thread.sleep(t.toMillis) @@ -642,14 +642,14 @@ trait TestKitBase { * Same as `expectNoMsg(remainingOrDefault)`, but correctly treating the timeFactor. */ @deprecated(message = "Use expectNoMessage instead", since = "2.5.5") - def expectNoMsg() { expectNoMsg_internal(remainingOrDefault) } + def expectNoMsg(): Unit = { expectNoMsg_internal(remainingOrDefault) } /** * Assert that no message is received for the specified time. * NOTE! Supplied value is always dilated. */ @deprecated(message = "Use expectNoMessage instead", since = "2.5.5") - def expectNoMsg(max: FiniteDuration) { + def expectNoMsg(max: FiniteDuration): Unit = { expectNoMsg_internal(max.dilated) } @@ -664,9 +664,9 @@ trait TestKitBase { /** * Same as `expectNoMessage(remainingOrDefault)`, but correctly treating the timeFactor. */ - def expectNoMessage() { expectNoMsg_internal(remainingOrDefault) } + def expectNoMessage(): Unit = { expectNoMsg_internal(remainingOrDefault) } - private def expectNoMsg_internal(max: FiniteDuration) { + private def expectNoMsg_internal(max: FiniteDuration): Unit = { val finish = System.nanoTime() + max.toNanos val pollInterval = 100.millis @@ -803,7 +803,7 @@ trait TestKitBase { def shutdown( actorSystem: ActorSystem = system, duration: Duration = 10.seconds.dilated.min(10.seconds), - verifySystemShutdown: Boolean = false) { + verifySystemShutdown: Boolean = false): Unit = { TestKit.shutdownActorSystem(actorSystem, duration, verifySystemShutdown) } diff --git a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala index 4778c9ee34..e01767e62b 100644 --- a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala @@ -77,23 +77,23 @@ abstract class AkkaSpec(_system: ActorSystem) override val invokeBeforeAllAndAfterAllEvenIfNoTestsAreExpected = true - final override def beforeAll { + final override def beforeAll: Unit = { startCoroner() atStartup() } - final override def afterAll { + final override def afterAll: Unit = { beforeTermination() shutdown() afterTermination() stopCoroner() } - protected def atStartup() {} + protected def atStartup(): Unit = {} - protected def beforeTermination() {} + protected def beforeTermination(): Unit = {} - protected def afterTermination() {} + protected def afterTermination(): Unit = {} def spawn(dispatcherId: String = Dispatchers.DefaultDispatcherId)(body: ⇒ Unit): Unit = Future(body)(system.dispatchers.lookup(dispatcherId)) diff --git a/akka-testkit/src/test/scala/akka/testkit/Coroner.scala b/akka-testkit/src/test/scala/akka/testkit/Coroner.scala index 9b047d2d85..fc4cd35ad6 100644 --- a/akka-testkit/src/test/scala/akka/testkit/Coroner.scala +++ b/akka-testkit/src/test/scala/akka/testkit/Coroner.scala @@ -119,7 +119,7 @@ object Coroner { /** * Print a report containing diagnostic information. */ - def printReport(reportTitle: String, out: PrintStream) { + def printReport(reportTitle: String, out: PrintStream): Unit = { import out.println val osMx = ManagementFactory.getOperatingSystemMXBean() @@ -251,12 +251,12 @@ trait WatchedByCoroner { @volatile private var coronerWatch: Coroner.WatchHandle = _ - final def startCoroner() { + final def startCoroner(): Unit = { coronerWatch = Coroner.watch(expectedTestDuration.dilated, getClass.getName, System.err, startAndStopDuration.dilated, displayThreadCounts) } - final def stopCoroner() { + final def stopCoroner(): Unit = { coronerWatch.cancel() coronerWatch = null } diff --git a/akka-testkit/src/test/scala/akka/testkit/CoronerSpec.scala b/akka-testkit/src/test/scala/akka/testkit/CoronerSpec.scala index 4edc757afa..db957135dc 100644 --- a/akka-testkit/src/test/scala/akka/testkit/CoronerSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/CoronerSpec.scala @@ -71,7 +71,7 @@ class CoronerSpec extends WordSpec with Matchers { val t = new Thread(new Runnable { def run = try recursiveLock(initialLocks) catch { case _: InterruptedException ⇒ () } - def recursiveLock(locks: List[ReentrantLock]) { + def recursiveLock(locks: List[ReentrantLock]): Unit = { locks match { case Nil ⇒ () case lock :: rest ⇒ { diff --git a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala index 259acf497b..462969d564 100644 --- a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala @@ -26,7 +26,7 @@ object TestActorRefSpec { def receive = new Receive { val recv = receiveT def isDefinedAt(o: Any) = recv.isDefinedAt(o) - def apply(o: Any) { + def apply(o: Any): Unit = { if (Thread.currentThread ne thread) otherthread = Thread.currentThread recv(o) @@ -193,8 +193,8 @@ class TestActorRefSpec extends AkkaSpec("disp1.type=Dispatcher") with BeforeAndA val boss = TestActorRef(Props(new TActor { val ref = TestActorRef(Props(new TActor { def receiveT = { case _ ⇒ } - override def preRestart(reason: Throwable, msg: Option[Any]) { counter -= 1 } - override def postRestart(reason: Throwable) { counter -= 1 } + override def preRestart(reason: Throwable, msg: Option[Any]): Unit = { counter -= 1 } + override def postRestart(reason: Throwable): Unit = { counter -= 1 } }), self, "child") override def supervisorStrategy = diff --git a/akka-testkit/src/test/scala/akka/testkit/TestProbeSpec.scala b/akka-testkit/src/test/scala/akka/testkit/TestProbeSpec.scala index 3a40d1066e..c9ba147aa9 100644 --- a/akka-testkit/src/test/scala/akka/testkit/TestProbeSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/TestProbeSpec.scala @@ -79,7 +79,7 @@ class TestProbeSpec extends AkkaSpec with DefaultTimeout with Eventually { } } - def assertFailureMessageContains(expectedHint: String)(block: ⇒ Unit) { + def assertFailureMessageContains(expectedHint: String)(block: ⇒ Unit): Unit = { Try { block } match { diff --git a/akka-testkit/src/test/scala/akka/testkit/metrics/AveragingGauge.scala b/akka-testkit/src/test/scala/akka/testkit/metrics/AveragingGauge.scala index 88be1a611f..d5739d2a61 100644 --- a/akka-testkit/src/test/scala/akka/testkit/metrics/AveragingGauge.scala +++ b/akka-testkit/src/test/scala/akka/testkit/metrics/AveragingGauge.scala @@ -18,12 +18,12 @@ class AveragingGauge extends Gauge[Double] { private val sum = new LongAdder private val count = new LongAdder - def add(n: Long) { + def add(n: Long): Unit = { count.increment() sum add n } - def add(ns: Seq[Long]) { + def add(ns: Seq[Long]): Unit = { // takes a mutable Seq on order to allow use with Array's count add ns.length sum add ns.sum diff --git a/akka-testkit/src/test/scala/akka/testkit/metrics/HdrHistogram.scala b/akka-testkit/src/test/scala/akka/testkit/metrics/HdrHistogram.scala index fc8f440666..d24f264427 100644 --- a/akka-testkit/src/test/scala/akka/testkit/metrics/HdrHistogram.scala +++ b/akka-testkit/src/test/scala/akka/testkit/metrics/HdrHistogram.scala @@ -24,7 +24,7 @@ private[akka] class HdrHistogram( private val hist = new hdr.Histogram(highestTrackableValue, numberOfSignificantValueDigits) - def update(value: Long) { + def update(value: Long): Unit = { try hist.recordValue(value) catch { @@ -32,7 +32,7 @@ private[akka] class HdrHistogram( } } - def updateWithCount(value: Long, count: Long) { + def updateWithCount(value: Long, count: Long): Unit = { try hist.recordValueWithCount(value, count) catch { diff --git a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKit.scala b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKit.scala index 55ec0e506a..05832b9d93 100644 --- a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKit.scala +++ b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKit.scala @@ -46,10 +46,10 @@ private[akka] trait MetricsKit extends MetricsKitOps { initMetricReporters() - def initMetricReporters() { + def initMetricReporters(): Unit = { val settings = new MetricsKitSettings(metricsConfig) - def configureConsoleReporter() { + def configureConsoleReporter(): Unit = { if (settings.Reporters.contains("console")) { val akkaConsoleReporter = new AkkaConsoleReporter(registry, settings.ConsoleReporter.Verbose) @@ -66,7 +66,7 @@ private[akka] trait MetricsKit extends MetricsKitOps { /** * Schedule metric reports execution iterval. Should not be used multiple times */ - def scheduleMetricReports(every: FiniteDuration) { + def scheduleMetricReports(every: FiniteDuration): Unit = { reporters foreach { _.start(every.toMillis, TimeUnit.MILLISECONDS) } } @@ -78,7 +78,7 @@ private[akka] trait MetricsKit extends MetricsKitOps { * * HINT: this operation can be costy, run outside of your tested code, or rely on scheduled reporting. */ - def reportAndClearMetrics() { + def reportAndClearMetrics(): Unit = { reportMetrics() clearMetrics() } @@ -90,7 +90,7 @@ private[akka] trait MetricsKit extends MetricsKitOps { * * HINT: this operation can be costy, run outside of your tested code, or rely on scheduled reporting. */ - def reportMetrics() { + def reportMetrics(): Unit = { if (reportMetricsEnabled) reporters foreach { _.report() } } @@ -100,7 +100,7 @@ private[akka] trait MetricsKit extends MetricsKitOps { * * HINT: this operation can be costy, run outside of your tested code, or rely on scheduled reporting. */ - def reportMemoryMetrics() { + def reportMemoryMetrics(): Unit = { val gauges = registry.getGauges(MemMetricsFilter) reporters foreach { _.report(gauges, empty, empty, empty, empty) } @@ -111,7 +111,7 @@ private[akka] trait MetricsKit extends MetricsKitOps { * * HINT: this operation can be costy, run outside of your tested code, or rely on scheduled reporting. */ - def reportGcMetrics() { + def reportGcMetrics(): Unit = { val gauges = registry.getGauges(GcMetricsFilter) reporters foreach { _.report(gauges, empty, empty, empty, empty) } @@ -122,7 +122,7 @@ private[akka] trait MetricsKit extends MetricsKitOps { * * HINT: this operation can be costy, run outside of your tested code, or rely on scheduled reporting. */ - def reportFileDescriptorMetrics() { + def reportFileDescriptorMetrics(): Unit = { val gauges = registry.getGauges(FileDescriptorMetricsFilter) reporters foreach { _.report(gauges, empty, empty, empty, empty) } @@ -136,14 +136,14 @@ private[akka] trait MetricsKit extends MetricsKitOps { * Please note that, if you have registered a `timer("thing")` previously, you will need to call `timer("thing")` again, * in order to register a new timer. */ - def clearMetrics(matching: MetricFilter = MetricFilter.ALL) { + def clearMetrics(matching: MetricFilter = MetricFilter.ALL): Unit = { registry.removeMatching(matching) } /** * MUST be called after all tests have finished. */ - def shutdownMetrics() { + def shutdownMetrics(): Unit = { reporters foreach { _.stop() } } diff --git a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitOps.scala b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitOps.scala index a38dabe797..706a64972c 100644 --- a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitOps.scala +++ b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitOps.scala @@ -58,7 +58,7 @@ private[akka] trait MetricsKitOps extends MetricKeyDSL { def forceGcEnabled: Boolean = true /** Yet another delegate to `System.gc()` */ - def gc() { + def gc(): Unit = { if (forceGcEnabled) System.gc() } diff --git a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitSpec.scala b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitSpec.scala index 4f66d85304..89206add68 100644 --- a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitSpec.scala @@ -20,7 +20,7 @@ class MetricsKitSpec extends WordSpec with Matchers with BeforeAndAfter with Bef clearMetrics() } - override def afterAll() { + override def afterAll(): Unit = { shutdownMetrics() } diff --git a/akka-testkit/src/test/scala/akka/testkit/metrics/reporter/AkkaConsoleReporter.scala b/akka-testkit/src/test/scala/akka/testkit/metrics/reporter/AkkaConsoleReporter.scala index bae129fa43..9ecba01537 100644 --- a/akka-testkit/src/test/scala/akka/testkit/metrics/reporter/AkkaConsoleReporter.scala +++ b/akka-testkit/src/test/scala/akka/testkit/metrics/reporter/AkkaConsoleReporter.scala @@ -22,7 +22,7 @@ class AkkaConsoleReporter( private final val ConsoleWidth = 80 - override def report(gauges: util.SortedMap[String, Gauge[_]], counters: util.SortedMap[String, Counter], histograms: util.SortedMap[String, Histogram], meters: util.SortedMap[String, Meter], timers: util.SortedMap[String, Timer]) { + override def report(gauges: util.SortedMap[String, Gauge[_]], counters: util.SortedMap[String, Counter], histograms: util.SortedMap[String, Histogram], meters: util.SortedMap[String, Meter], timers: util.SortedMap[String, Timer]): Unit = { import collection.JavaConverters._ // default Metrics types @@ -41,7 +41,7 @@ class AkkaConsoleReporter( output.flush() } - def printMetrics[T <: Metric](metrics: Iterable[(String, T)], printer: T ⇒ Unit)(implicit clazz: ClassTag[T]) { + def printMetrics[T <: Metric](metrics: Iterable[(String, T)], printer: T ⇒ Unit)(implicit clazz: ClassTag[T]): Unit = { if (!metrics.isEmpty) { printWithBanner(s"-- ${simpleName(metrics.head._2.getClass)}", '-') for ((key, metric) ← metrics) { @@ -52,7 +52,7 @@ class AkkaConsoleReporter( } } - private def printMeter(meter: Meter) { + private def printMeter(meter: Meter): Unit = { output.print(" count = %d%n".format(meter.getCount)) output.print(" mean rate = %2.2f events/%s%n".format(convertRate(meter.getMeanRate), getRateUnit)) output.print(" 1-minute rate = %2.2f events/%s%n".format(convertRate(meter.getOneMinuteRate), getRateUnit)) @@ -60,15 +60,15 @@ class AkkaConsoleReporter( output.print(" 15-minute rate = %2.2f events/%s%n".format(convertRate(meter.getFifteenMinuteRate), getRateUnit)) } - private def printCounter(entry: Counter) { + private def printCounter(entry: Counter): Unit = { output.print(" count = %d%n".format(entry.getCount)) } - private def printGauge(entry: Gauge[_]) { + private def printGauge(entry: Gauge[_]): Unit = { output.print(" value = %s%n".format(entry.getValue)) } - private def printHistogram(histogram: Histogram) { + private def printHistogram(histogram: Histogram): Unit = { val snapshot = histogram.getSnapshot output.print(" count = %d%n".format(histogram.getCount)) output.print(" min = %d%n".format(snapshot.getMin)) @@ -83,7 +83,7 @@ class AkkaConsoleReporter( output.print(" 99.9%% <= %2.2f%n".format(snapshot.get999thPercentile)) } - private def printTimer(timer: Timer) { + private def printTimer(timer: Timer): Unit = { val snapshot = timer.getSnapshot output.print(" count = %d%n".format(timer.getCount)) output.print(" mean rate = %2.2f calls/%s%n".format(convertRate(timer.getMeanRate), getRateUnit)) @@ -102,7 +102,7 @@ class AkkaConsoleReporter( output.print(" 99.9%% <= %2.2f %s%n".format(convertDuration(snapshot.get999thPercentile), getDurationUnit)) } - private def printKnownOpsInTimespanCounter(counter: KnownOpsInTimespanTimer) { + private def printKnownOpsInTimespanCounter(counter: KnownOpsInTimespanTimer): Unit = { import concurrent.duration._ import akka.util.PrettyDuration._ output.print(" ops = %d%n".format(counter.getCount)) @@ -111,7 +111,7 @@ class AkkaConsoleReporter( output.print(" avg = %s%n".format(counter.avgDuration.nanos.pretty)) } - private def printHdrHistogram(hist: HdrHistogram) { + private def printHdrHistogram(hist: HdrHistogram): Unit = { val data = hist.getData val unit = hist.unit output.print(" min = %d %s%n".format(data.getMinValue, unit)) @@ -128,11 +128,11 @@ class AkkaConsoleReporter( data.outputPercentileDistribution(output, 1) } - private def printAveragingGauge(gauge: AveragingGauge) { + private def printAveragingGauge(gauge: AveragingGauge): Unit = { output.print(" avg = %2.2f%n".format(gauge.getValue)) } - private def printWithBanner(s: String, c: Char) { + private def printWithBanner(s: String, c: Char): Unit = { output.print(s) output.print(' ') var i: Int = 0 diff --git a/project/MultiNode.scala b/project/MultiNode.scala index 7c32bcd4cf..4d11bc97b2 100644 --- a/project/MultiNode.scala +++ b/project/MultiNode.scala @@ -68,8 +68,8 @@ object MultiNode extends AutoPlugin { val logger = streams.value.log (name: String) => new Logger { - def trace(t: => Throwable) { logger.trace(t) } - def success(message: => String) { success(message) } + def trace(t: => Throwable): Unit = { logger.trace(t) } + def success(message: => String): Unit = { success(message) } def log(level: Level.Value, message: => String): Unit = logger.log(level, s"[${scala.Console.BLUE}$name${scala.Console.RESET}] $message") }