From 8a2e522a6ee7e1b4748c4cac0291d6397c7ee9a5 Mon Sep 17 00:00:00 2001 From: Dario Rexin Date: Fri, 26 Apr 2013 21:07:38 +0200 Subject: [PATCH] removed deprecation warnings from akka-remote --- .../src/main/scala/akka/remote/Remoting.scala | 2 +- .../transport/AkkaProtocolTransport.scala | 10 ++--- .../transport/ThrottlerTransportAdapter.scala | 4 +- .../test/scala/akka/remote/RemotingSpec.scala | 4 +- .../remote/transport/AkkaProtocolSpec.scala | 44 +++++++++---------- .../transport/AkkaProtocolStressTest.scala | 2 +- .../SystemMessageDeliveryStressTest.scala | 2 +- .../ThrottlerTransportAdapterSpec.scala | 2 +- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/akka-remote/src/main/scala/akka/remote/Remoting.scala b/akka-remote/src/main/scala/akka/remote/Remoting.scala index 80192694ec..a80804550e 100644 --- a/akka-remote/src/main/scala/akka/remote/Remoting.scala +++ b/akka-remote/src/main/scala/akka/remote/Remoting.scala @@ -157,7 +157,7 @@ private[remote] class Remoting(_system: ExtendedActorSystem, _provider: RemoteAc case None ⇒ log.info("Starting remoting") val manager: ActorRef = system.asInstanceOf[ActorSystemImpl].systemActorOf( - Props(new EndpointManager(provider.remoteSettings.config, log)), Remoting.EndpointManagerName) + Props(classOf[EndpointManager], provider.remoteSettings.config, log), Remoting.EndpointManagerName) endpointManager = Some(manager) try { diff --git a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala index 7c88b09e61..0386e7d449 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala @@ -90,7 +90,7 @@ private[remote] class AkkaProtocolTransport( protected def managerProps = { val wt = wrappedTransport val s = settings - Props(new AkkaProtocolManager(wt, s)) + Props(classOf[AkkaProtocolManager], wt, s) } } @@ -114,27 +114,27 @@ private[transport] class AkkaProtocolManager( val stateActorAssociationHandler = associationListener val stateActorSettings = settings val failureDetector = createTransportFailureDetector() - context.actorOf(Props(new ProtocolStateActor( + context.actorOf(Props(classOf[ProtocolStateActor], HandshakeInfo(stateActorLocalAddress, AddressUidExtension(context.system).addressUid, stateActorSettings.SecureCookie), handle, stateActorAssociationHandler, stateActorSettings, AkkaPduProtobufCodec, - failureDetector)), actorNameFor(handle.remoteAddress)) + failureDetector), actorNameFor(handle.remoteAddress)) case AssociateUnderlying(remoteAddress, statusPromise) ⇒ val stateActorLocalAddress = localAddress val stateActorSettings = settings val stateActorWrappedTransport = wrappedTransport val failureDetector = createTransportFailureDetector() - context.actorOf(Props(new ProtocolStateActor( + context.actorOf(Props(classOf[ProtocolStateActor], HandshakeInfo(stateActorLocalAddress, AddressUidExtension(context.system).addressUid, stateActorSettings.SecureCookie), remoteAddress, statusPromise, stateActorWrappedTransport, stateActorSettings, AkkaPduProtobufCodec, - failureDetector)), actorNameFor(remoteAddress)) + failureDetector), actorNameFor(remoteAddress)) } private def createTransportFailureDetector(): FailureDetector = { diff --git a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala index bf19a6e9aa..85d48e2344 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala @@ -164,7 +164,7 @@ class ThrottlerTransportAdapter(_wrappedTransport: Transport, _system: ExtendedA protected def managerName: String = s"throttlermanager.${wrappedTransport.schemeIdentifier}${UniqueId.getAndIncrement}" protected def managerProps: Props = { val wt = wrappedTransport - Props(new ThrottlerManager(wt)) + Props(classOf[ThrottlerManager], wt) } override def managementCommand(cmd: Any): Future[Boolean] = { @@ -289,7 +289,7 @@ private[transport] class ThrottlerManager(wrappedTransport: Transport) extends A val managerRef = self ThrottlerHandle( originalHandle, - context.actorOf(Props(new ThrottledAssociation(managerRef, listener, originalHandle, inbound)), "throttler" + nextId())) + context.actorOf(Props(classOf[ThrottledAssociation], managerRef, listener, originalHandle, inbound), "throttler" + nextId())) } } diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala index 98b83ce45b..29255c7785 100644 --- a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala @@ -519,13 +519,13 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D // check that we use the specified transport address instead of the default val otherGuyRemoteTcp = otherGuy.path.toSerializationFormatWithAddress(addr(otherSystem, "tcp")) val remoteEchoHereTcp = system.actorFor(s"akka.tcp://remote-sys@localhost:${port(remoteSystem, "tcp")}/user/echo") - val proxyTcp = system.actorOf(Props(new Proxy(remoteEchoHereTcp, testActor)), "proxy-tcp") + val proxyTcp = system.actorOf(Props(classOf[Proxy], remoteEchoHereTcp, testActor), "proxy-tcp") proxyTcp ! otherGuy expectMsg(3.seconds, ("pong", otherGuyRemoteTcp)) // now check that we fall back to default when we haven't got a corresponding transport val otherGuyRemoteTest = otherGuy.path.toSerializationFormatWithAddress(addr(otherSystem, "test")) val remoteEchoHereSsl = system.actorFor(s"akka.ssl.tcp://remote-sys@localhost:${port(remoteSystem, "ssl.tcp")}/user/echo") - val proxySsl = system.actorOf(Props(new Proxy(remoteEchoHereSsl, testActor)), "proxy-ssl") + val proxySsl = system.actorOf(Props(classOf[Proxy], remoteEchoHereSsl, testActor), "proxy-ssl") EventFilter[RemoteTransportException](start = "Error while resolving address", occurrences = 1).intercept { proxySsl ! otherGuy expectMsg(3.seconds, ("pong", otherGuyRemoteTest)) diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala index 06f2612053..a8a20108f4 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala @@ -123,13 +123,13 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re "register itself as reader on injecteted handles" in { val (failureDetector, _, _, handle) = collaborators - system.actorOf(Props(new ProtocolStateActor( + system.actorOf(Props(classOf[ProtocolStateActor], HandshakeInfo(origin = localAddress, uid = 42, cookie = None), handle, ActorAssociationEventListener(testActor), new AkkaProtocolSettings(conf), codec, - failureDetector))) + failureDetector)) awaitCond(handle.readHandlerPromise.isCompleted) } @@ -137,13 +137,13 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re "in inbound mode accept payload after Associate PDU received" in { val (failureDetector, registry, _, handle) = collaborators - val reader = system.actorOf(Props(new ProtocolStateActor( + val reader = system.actorOf(Props(classOf[ProtocolStateActor], HandshakeInfo(origin = localAddress, uid = 42, cookie = None), handle, ActorAssociationEventListener(testActor), new AkkaProtocolSettings(conf), codec, - failureDetector))) + failureDetector)) reader ! testAssociate(uid = 33, cookie = None) @@ -172,13 +172,13 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re "in inbound mode disassociate when an unexpected message arrives instead of Associate" in { val (failureDetector, registry, _, handle) = collaborators - val reader = system.actorOf(Props(new ProtocolStateActor( + val reader = system.actorOf(Props(classOf[ProtocolStateActor], HandshakeInfo(origin = localAddress, uid = 42, cookie = None), handle, ActorAssociationEventListener(testActor), new AkkaProtocolSettings(conf), codec, - failureDetector))) + failureDetector)) // a stray message will force a disassociate reader ! testHeartbeat @@ -198,14 +198,14 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re val statusPromise: Promise[AssociationHandle] = Promise() - val reader = system.actorOf(Props(new ProtocolStateActor( + val reader = system.actorOf(Props(classOf[ProtocolStateActor], HandshakeInfo(origin = localAddress, uid = 42, cookie = None), remoteAddress, statusPromise, transport, new AkkaProtocolSettings(conf), codec, - failureDetector))) + failureDetector)) awaitCond(lastActivityIsAssociate(registry, 42, None)) failureDetector.called must be(true) @@ -232,13 +232,13 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re "ignore incoming associations with wrong cookie" in { val (failureDetector, registry, _, handle) = collaborators - val reader = system.actorOf(Props(new ProtocolStateActor( + val reader = system.actorOf(Props(classOf[ProtocolStateActor], HandshakeInfo(origin = localAddress, uid = 42, cookie = Some("abcde")), handle, ActorAssociationEventListener(testActor), new AkkaProtocolSettings(ConfigFactory.parseString("akka.remote.require-cookie = on").withFallback(conf)), codec, - failureDetector))) + failureDetector)) reader ! testAssociate(uid = 33, Some("xyzzy")) @@ -251,13 +251,13 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re "accept incoming associations with correct cookie" in { val (failureDetector, registry, _, handle) = collaborators - val reader = system.actorOf(Props(new ProtocolStateActor( + val reader = system.actorOf(Props(classOf[ProtocolStateActor], HandshakeInfo(origin = localAddress, uid = 42, cookie = Some("abcde")), handle, ActorAssociationEventListener(testActor), new AkkaProtocolSettings(ConfigFactory.parseString("akka.remote.require-cookie = on").withFallback(conf)), codec, - failureDetector))) + failureDetector)) // Send the correct cookie reader ! testAssociate(uid = 33, Some("abcde")) @@ -283,14 +283,14 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re val statusPromise: Promise[AssociationHandle] = Promise() - system.actorOf(Props(new ProtocolStateActor( + system.actorOf(Props(classOf[ProtocolStateActor], HandshakeInfo(origin = localAddress, uid = 42, cookie = Some("abcde")), remoteAddress, statusPromise, transport, new AkkaProtocolSettings(ConfigFactory.parseString("akka.remote.require-cookie = on").withFallback(conf)), codec, - failureDetector))) + failureDetector)) awaitCond(lastActivityIsAssociate(registry, uid = 42, cookie = Some("abcde"))) } @@ -301,14 +301,14 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re val statusPromise: Promise[AssociationHandle] = Promise() - val reader = system.actorOf(Props(new ProtocolStateActor( + val reader = system.actorOf(Props(classOf[ProtocolStateActor], HandshakeInfo(origin = localAddress, uid = 42, cookie = None), remoteAddress, statusPromise, transport, new AkkaProtocolSettings(conf), codec, - failureDetector))) + failureDetector)) awaitCond(lastActivityIsAssociate(registry, uid = 42, cookie = None)) @@ -336,14 +336,14 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re val statusPromise: Promise[AssociationHandle] = Promise() - val reader = system.actorOf(Props(new ProtocolStateActor( + val reader = system.actorOf(Props(classOf[ProtocolStateActor], HandshakeInfo(origin = localAddress, uid = 42, cookie = None), remoteAddress, statusPromise, transport, new AkkaProtocolSettings(conf), codec, - failureDetector))) + failureDetector)) awaitCond(lastActivityIsAssociate(registry, uid = 42, cookie = None)) @@ -371,14 +371,14 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re val statusPromise: Promise[AssociationHandle] = Promise() - val stateActor = system.actorOf(Props(new ProtocolStateActor( + val stateActor = system.actorOf(Props(classOf[ProtocolStateActor], HandshakeInfo(origin = localAddress, uid = 42, cookie = None), remoteAddress, statusPromise, transport, new AkkaProtocolSettings(conf), codec, - failureDetector))) + failureDetector)) awaitCond(lastActivityIsAssociate(registry, uid = 42, cookie = None)) @@ -409,14 +409,14 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re val statusPromise: Promise[AssociationHandle] = Promise() - val stateActor = system.actorOf(Props(new ProtocolStateActor( + val stateActor = system.actorOf(Props(classOf[ProtocolStateActor], HandshakeInfo(origin = localAddress, uid = 42, cookie = None), remoteAddress, statusPromise, transport, new AkkaProtocolSettings(conf), codec, - failureDetector))) + failureDetector)) awaitCond(lastActivityIsAssociate(registry, uid = 42, cookie = None)) 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 2bf7945e3c..aef60384a8 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala @@ -84,7 +84,7 @@ class AkkaProtocolStressTest extends AkkaSpec(configA) with ImplicitSender with "guarantee at-most-once delivery and message ordering despite packet loss" taggedAs TimingTest in { Await.result(RARP(system).provider.transport.managementCommand(One(addressB, Drop(0.3, 0.3))), 3.seconds.dilated) - val tester = system.actorOf(Props(new SequenceVerifier(here, self))) ! "start" + val tester = system.actorOf(Props(classOf[SequenceVerifier], here, self)) ! "start" expectMsgPF(45.seconds) { case (received: Int, lost: Int) ⇒ 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 0064249c5a..21a80d67b7 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/SystemMessageDeliveryStressTest.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/SystemMessageDeliveryStressTest.scala @@ -117,7 +117,7 @@ abstract class SystemMessageDeliveryStressTest(msg: String, cfg: String) "Remoting " + msg must { "guaranteed delivery and message ordering despite packet loss " taggedAs TimingTest in { Await.result(RARP(systemB).provider.transport.managementCommand(One(address, Drop(0.3, 0.3))), 3.seconds.dilated) - systemB.actorOf(Props(new SystemMessageSender(MsgCount, there))) + systemB.actorOf(Props(classOf[SystemMessageSender], MsgCount, there)) val toSend = (0 until MsgCount).toList val received = expectMsgAllOf(45.seconds, toSend: _*) 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 ae73303a0c..13354c951f 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala @@ -84,7 +84,7 @@ class ThrottlerTransportAdapterSpec extends AkkaSpec(configA) with ImplicitSende "ThrottlerTransportAdapter" must { "maintain average message rate" taggedAs TimingTest in { throttle(Direction.Send, TokenBucket(200, 500, 0, 0)) must be(true) - val tester = system.actorOf(Props(new ThrottlingTester(here, self))) ! "start" + val tester = system.actorOf(Props(classOf[ThrottlingTester], here, self)) ! "start" val time = NANOSECONDS.toSeconds(expectMsgType[Long]((TotalTime + 3).seconds)) log.warning("Total time of transmission: " + time)