From 5fef4d1ac39f56f40d1be097ceebbd815b85b973 Mon Sep 17 00:00:00 2001 From: Heiko Seeberger Date: Fri, 2 Jul 2010 22:37:26 +0200 Subject: [PATCH] re #290: Added parens to no-parameter methods returning Unit in all subprojects. --- akka-camel/src/main/scala/CamelContextLifecycle.scala | 2 +- .../src/test/scala/component/ActorProducerTest.scala | 2 +- akka-core/src/test/scala/ThreadBasedDispatcherSpec.scala | 4 ++-- akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala | 2 +- akka-jta/src/main/scala/TransactionProtocol.scala | 2 +- akka-kernel/src/main/scala/EmbeddedAppServer.scala | 2 +- akka-kernel/src/main/scala/Kernel.scala | 4 ++-- .../src/test/scala/CassandraPersistentActorSpec.scala | 2 +- .../akka-persistence-common/src/main/scala/Pool.scala | 8 ++++---- .../akka-sample-chat/src/main/scala/ChatServer.scala | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/akka-camel/src/main/scala/CamelContextLifecycle.scala b/akka-camel/src/main/scala/CamelContextLifecycle.scala index 66646eed57..640ba14e36 100644 --- a/akka-camel/src/main/scala/CamelContextLifecycle.scala +++ b/akka-camel/src/main/scala/CamelContextLifecycle.scala @@ -86,7 +86,7 @@ trait CamelContextLifecycle extends Logging { /** * Initializes this lifecycle object with the a DefaultCamelContext. */ - def init: Unit = init(new DefaultCamelContext) + def init(): Unit = init(new DefaultCamelContext) /** * Initializes this lifecycle object with the given CamelContext. For the passed diff --git a/akka-camel/src/test/scala/component/ActorProducerTest.scala b/akka-camel/src/test/scala/component/ActorProducerTest.scala index 6840bf1c79..f6d5f88d36 100644 --- a/akka-camel/src/test/scala/component/ActorProducerTest.scala +++ b/akka-camel/src/test/scala/component/ActorProducerTest.scala @@ -58,7 +58,7 @@ class ActorProducerTest extends JUnitSuite with BeforeAndAfterAll { assert(exchange.getOut.getHeader("k3") === null) // headers from failure message are currently ignored } - @Test def shouldSendMessageToActorAndTimeout: Unit = { + @Test def shouldSendMessageToActorAndTimeout(): Unit = { val actor = actorOf[Tester3].start val endpoint = mockEndpoint("actor:uuid:%s" format actor.uuid) val exchange = endpoint.createExchange(ExchangePattern.InOut) diff --git a/akka-core/src/test/scala/ThreadBasedDispatcherSpec.scala b/akka-core/src/test/scala/ThreadBasedDispatcherSpec.scala index bdacd3208c..44cd9aade3 100644 --- a/akka-core/src/test/scala/ThreadBasedDispatcherSpec.scala +++ b/akka-core/src/test/scala/ThreadBasedDispatcherSpec.scala @@ -54,7 +54,7 @@ class ThreadBasedDispatcherSpec extends JUnitSuite { internalTestMessagesDispatchedToHandlersAreExecutedInFIFOOrder } - private def internalTestMessagesDispatchedToTheSameHandlerAreExecutedSequentially: Unit = { + private def internalTestMessagesDispatchedToTheSameHandlerAreExecutedSequentially(): Unit = { val guardLock = new ReentrantLock val handleLatch = new CountDownLatch(100) val dispatcher = new ThreadBasedDispatcher("name", new TestMessageHandle(handleLatch)) @@ -66,7 +66,7 @@ class ThreadBasedDispatcherSpec extends JUnitSuite { assert(!threadingIssueDetected.get) } - private def internalTestMessagesDispatchedToHandlersAreExecutedInFIFOOrder: Unit = { + private def internalTestMessagesDispatchedToHandlersAreExecutedInFIFOOrder(): Unit = { val handleLatch = new CountDownLatch(100) val dispatcher = new ThreadBasedDispatcher("name", new MessageInvoker { var currentValue = -1; diff --git a/akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala b/akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala index a4dffdea94..775c8b554d 100644 --- a/akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala +++ b/akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala @@ -27,7 +27,7 @@ class AkkaClusterBroadcastFilter extends Actor with ClusterBroadcastFilter { /** * Stops the actor */ - def destroy: Unit = self.stop + def destroy(): Unit = self.stop /** * Relays all non ClusterCometBroadcast messages to the other AkkaClusterBroadcastFilters in the cluster diff --git a/akka-jta/src/main/scala/TransactionProtocol.scala b/akka-jta/src/main/scala/TransactionProtocol.scala index 866ae72ec8..96567916a3 100644 --- a/akka-jta/src/main/scala/TransactionProtocol.scala +++ b/akka-jta/src/main/scala/TransactionProtocol.scala @@ -71,7 +71,7 @@ trait TransactionProtocol extends Logging { protected val joinTransactionFuns: JList[() => Unit] = new CopyOnWriteArrayList[() => Unit] protected val exceptionsNotToRollbackOn: JList[Class[_ <: Exception]] = new CopyOnWriteArrayList[Class[_ <: Exception]] - def joinTransaction: Unit = { + def joinTransaction(): Unit = { val it = joinTransactionFuns.iterator while (it.hasNext) { val fn = it.next diff --git a/akka-kernel/src/main/scala/EmbeddedAppServer.scala b/akka-kernel/src/main/scala/EmbeddedAppServer.scala index 8f5495b5c1..94cc2a01d1 100644 --- a/akka-kernel/src/main/scala/EmbeddedAppServer.scala +++ b/akka-kernel/src/main/scala/EmbeddedAppServer.scala @@ -44,7 +44,7 @@ trait EmbeddedAppServer extends Bootable with Logging { val adapter = new ServletAdapter adapter.setHandleStaticResources(true) adapter.setServletInstance(new AkkaServlet { - override def init(sc : ServletConfig) : Unit = { + override def init(sc : ServletConfig): Unit = { val cl = Thread.currentThread.getContextClassLoader try { Thread.currentThread.setContextClassLoader(applicationLoader.get) diff --git a/akka-kernel/src/main/scala/Kernel.scala b/akka-kernel/src/main/scala/Kernel.scala index 4b5fa83574..6489a60680 100644 --- a/akka-kernel/src/main/scala/Kernel.scala +++ b/akka-kernel/src/main/scala/Kernel.scala @@ -23,13 +23,13 @@ object Kernel extends AkkaLoader { /** * Boots up the Kernel with default bootables */ - def boot: Unit = boot(true, + def boot(): Unit = boot(true, new EmbeddedAppServer with BootableActorLoaderService with BootableRemoteActorService with CamelService) //For testing purposes only - def startRemoteService: Unit = bundles.foreach( _ match { + def startRemoteService(): Unit = bundles.foreach( _ match { case x: BootableRemoteActorService => x.startRemoteService case _ => }) diff --git a/akka-persistence/akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala b/akka-persistence/akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala index c94fdee815..c4ac603208 100644 --- a/akka-persistence/akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala +++ b/akka-persistence/akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala @@ -168,7 +168,7 @@ object // EmbeddedCassandraService { t.setDaemon(true) t.start - def start: Unit = {} + def start(): Unit = {} } */ diff --git a/akka-persistence/akka-persistence-common/src/main/scala/Pool.scala b/akka-persistence/akka-persistence-common/src/main/scala/Pool.scala index 0eb0fda34e..063cf3fe63 100644 --- a/akka-persistence/akka-persistence-common/src/main/scala/Pool.scala +++ b/akka-persistence/akka-persistence-common/src/main/scala/Pool.scala @@ -13,10 +13,10 @@ trait Pool[T] extends java.io.Closeable { def borrowObject: T def returnObject(t: T): Unit def invalidateObject(t: T): Unit - def addObject: Unit + def addObject(): Unit def getNumIdle: Int def getNumActive: Int - def clear: Unit + def clear(): Unit def setFactory(factory: PoolItemFactory[T]): Unit } @@ -40,8 +40,8 @@ trait PoolBridge[T, OP <: ObjectPool] extends Pool[T] { override def addObject = impl.addObject override def getNumIdle: Int = impl.getNumIdle override def getNumActive: Int = impl.getNumActive - override def clear: Unit = impl.clear - override def close: Unit = impl.close + override def clear(): Unit = impl.clear() + override def close(): Unit = impl.close() override def setFactory(factory: PoolItemFactory[T]) = impl.setFactory(toPoolableObjectFactory(factory)) def toPoolableObjectFactory[T](pif: PoolItemFactory[T]) = new PoolableObjectFactory { diff --git a/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala b/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala index 01e1738b87..e3fd76a344 100644 --- a/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala +++ b/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala @@ -183,7 +183,7 @@ trait ChatServer extends Actor { // abstract methods to be defined somewhere else protected def chatManagement: Receive protected def sessionManagement: Receive - protected def shutdownSessions: Unit + protected def shutdownSessions(): Unit override def shutdown = { log.info("Chat server is shutting down...")