diff --git a/akka-actor-tests/src/test/scala/akka/io/BackpressureSpec.scala b/akka-actor-tests/src/test/scala/akka/io/BackpressureSpec.scala index 0f3849963b..1217acbc27 100644 --- a/akka-actor-tests/src/test/scala/akka/io/BackpressureSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/BackpressureSpec.scala @@ -37,7 +37,7 @@ object BackpressureSpec { val init = TcpPipelineHandler.withLogger(log, new TcpReadWriteAdapter >> new BackpressureBuffer(10000, 1000000, Long.MaxValue)) - val handler = context.actorOf(TcpPipelineHandler(init, sender, self).withDeploy(Deploy.local), "pipeline") + val handler = context.actorOf(TcpPipelineHandler.props(init, sender, self).withDeploy(Deploy.local), "pipeline") sender ! Tcp.Register(handler) unstashAll() context.become(connected(init, handler)) @@ -114,7 +114,7 @@ object BackpressureSpec { val init = TcpPipelineHandler.withLogger(log, new TcpReadWriteAdapter >> new BackpressureBuffer(10000, 1000000, Long.MaxValue)) - val handler = context.actorOf(TcpPipelineHandler(init, sender, self).withDeploy(Deploy.local), "pipeline") + val handler = context.actorOf(TcpPipelineHandler.props(init, sender, self).withDeploy(Deploy.local), "pipeline") sender ! Tcp.Register(handler) unstashAll() context.become(connected(init, handler)) diff --git a/akka-actor-tests/src/test/scala/akka/io/DelimiterFramingSpec.scala b/akka-actor-tests/src/test/scala/akka/io/DelimiterFramingSpec.scala index 6673e9976e..e2c441d08d 100644 --- a/akka-actor-tests/src/test/scala/akka/io/DelimiterFramingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/DelimiterFramingSpec.scala @@ -69,7 +69,7 @@ class DelimiterFramingSpec extends AkkaSpec("akka.actor.serialize-creators = on" import init._ - val handler = system.actorOf(TcpPipelineHandler(init, connection, probe.ref).withDeploy(Deploy.local), + val handler = system.actorOf(TcpPipelineHandler.props(init, connection, probe.ref).withDeploy(Deploy.local), "client" + counter.incrementAndGet()) probe.send(connection, Tcp.Register(handler)) @@ -129,7 +129,7 @@ class DelimiterFramingSpec extends AkkaSpec("akka.actor.serialize-creators = on" import init._ val connection = sender - val handler = context.actorOf(TcpPipelineHandler(init, sender, self).withDeploy(Deploy.local), "pipeline") + val handler = context.actorOf(TcpPipelineHandler.props(init, sender, self).withDeploy(Deploy.local), "pipeline") connection ! Tcp.Register(handler) diff --git a/akka-actor/src/main/scala/akka/io/TcpPipelineHandler.scala b/akka-actor/src/main/scala/akka/io/TcpPipelineHandler.scala index 193d1d7e72..5c49d92957 100644 --- a/akka-actor/src/main/scala/akka/io/TcpPipelineHandler.scala +++ b/akka-actor/src/main/scala/akka/io/TcpPipelineHandler.scala @@ -94,15 +94,9 @@ object TcpPipelineHandler { case class TcpEvent(@BeanProperty evt: Tcp.Event) extends Tcp.Command /** - * Scala API: create [[Props]] for a pipeline handler + * create [[Props]] for a pipeline handler */ - def apply[Ctx <: PipelineContext, Cmd, Evt](init: TcpPipelineHandler.Init[Ctx, Cmd, Evt], connection: ActorRef, handler: ActorRef) = - Props(classOf[TcpPipelineHandler[_, _, _]], init, connection, handler) - - /** - * Java API: create [[Props]] for a pipeline handler - */ - def create[Ctx <: PipelineContext, Cmd, Evt](init: TcpPipelineHandler.Init[Ctx, Cmd, Evt], connection: ActorRef, handler: ActorRef) = + def props[Ctx <: PipelineContext, Cmd, Evt](init: TcpPipelineHandler.Init[Ctx, Cmd, Evt], connection: ActorRef, handler: ActorRef) = Props(classOf[TcpPipelineHandler[_, _, _]], init, connection, handler) } diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala index 82ceff0914..288e8736b4 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala @@ -65,7 +65,7 @@ private[akka] class ClusterActorRefProvider( failureDetector, heartbeatInterval = WatchHeartBeatInterval, unreachableReaperInterval = WatchUnreachableReaperInterval, - heartbeatExpectedResponseAfter = WatchHeartbeatExpectedResponseAfter).withDeploy(Deploy.local), "remote-watcher") + heartbeatExpectedResponseAfter = WatchHeartbeatExpectedResponseAfter), "remote-watcher") } /** diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterRemoteWatcher.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterRemoteWatcher.scala index c3dde99738..a98eaa1f57 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterRemoteWatcher.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterRemoteWatcher.scala @@ -13,6 +13,7 @@ import akka.cluster.ClusterEvent.MemberUp import akka.cluster.ClusterEvent.MemberRemoved import akka.remote.FailureDetectorRegistry import akka.remote.RemoteWatcher +import akka.actor.Deploy /** * INTERNAL API @@ -27,7 +28,7 @@ private[cluster] object ClusterRemoteWatcher { unreachableReaperInterval: FiniteDuration, heartbeatExpectedResponseAfter: FiniteDuration): Props = Props(classOf[ClusterRemoteWatcher], failureDetector, heartbeatInterval, unreachableReaperInterval, - heartbeatExpectedResponseAfter) + heartbeatExpectedResponseAfter).withDeploy(Deploy.local) } /** diff --git a/akka-docs/rst/java/code/docs/io/japi/SslDocTest.java b/akka-docs/rst/java/code/docs/io/japi/SslDocTest.java index e1d75faa87..f5801bda3b 100644 --- a/akka-docs/rst/java/code/docs/io/japi/SslDocTest.java +++ b/akka-docs/rst/java/code/docs/io/japi/SslDocTest.java @@ -91,7 +91,7 @@ public class SslDocTest { // create handler for pipeline, setting ourselves as payload recipient final ActorRef handler = getContext().actorOf( - TcpPipelineHandler.create(init, getSender(), getSelf())); + TcpPipelineHandler.props(init, getSender(), getSelf())); // register the SSL handler with the connection getSender().tell(TcpMessage.register(handler), getSelf()); @@ -156,7 +156,7 @@ public class SslDocTest { // create handler for pipeline, setting ourselves as payload recipient final ActorRef handler = getContext().actorOf( - TcpPipelineHandler.create(init, getSender(), getSelf())); + TcpPipelineHandler.props(init, getSender(), getSelf())); // register the SSL handler with the connection getSender().tell(TcpMessage.register(handler), getSelf()); diff --git a/akka-remote/src/main/scala/akka/remote/Endpoint.scala b/akka-remote/src/main/scala/akka/remote/Endpoint.scala index d9dd4dd758..5f8eb81926 100644 --- a/akka-remote/src/main/scala/akka/remote/Endpoint.scala +++ b/akka-remote/src/main/scala/akka/remote/Endpoint.scala @@ -147,7 +147,7 @@ private[remote] object ReliableDeliverySupervisor { case object Ungate case class GotUid(uid: Int) - def apply( + def props( handleOrActive: Option[AkkaProtocolHandle], localAddress: Address, remoteAddress: Address, @@ -299,7 +299,7 @@ private[remote] class ReliableDeliverySupervisor( } private def createWriter(): ActorRef = { - context.watch(context.actorOf(EndpointWriter( + context.watch(context.actorOf(EndpointWriter.props( handleOrActive = currentHandle, localAddress = localAddress, remoteAddress = remoteAddress, @@ -339,7 +339,7 @@ private[remote] abstract class EndpointActor( */ private[remote] object EndpointWriter { - def apply( + def props( handleOrActive: Option[AkkaProtocolHandle], localAddress: Address, remoteAddress: Address, @@ -580,7 +580,7 @@ private[remote] class EndpointWriter( private def startReadEndpoint(handle: AkkaProtocolHandle): Some[ActorRef] = { val newReader = context.watch(context.actorOf( - EndpointReader(localAddress, remoteAddress, transport, settings, codec, + EndpointReader.props(localAddress, remoteAddress, transport, settings, codec, msgDispatch, inbound, reliableDeliverySupervisor, receiveBuffers).withDeploy(Deploy.local), "endpointReader-" + AddressUrlEncoder(remoteAddress) + "-" + readerId.next())) handle.readHandlerPromise.success(ActorHandleEventListener(newReader)) @@ -603,7 +603,7 @@ private[remote] class EndpointWriter( */ private[remote] object EndpointReader { - def apply( + def props( localAddress: Address, remoteAddress: Address, transport: Transport, diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala index 990e6d32b5..373d475d33 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala @@ -191,7 +191,7 @@ private[akka] class RemoteActorRefProvider( failureDetector, heartbeatInterval = WatchHeartBeatInterval, unreachableReaperInterval = WatchUnreachableReaperInterval, - heartbeatExpectedResponseAfter = WatchHeartbeatExpectedResponseAfter).withDeploy(Deploy.local), + heartbeatExpectedResponseAfter = WatchHeartbeatExpectedResponseAfter), "remote-watcher") } diff --git a/akka-remote/src/main/scala/akka/remote/RemoteWatcher.scala b/akka-remote/src/main/scala/akka/remote/RemoteWatcher.scala index 68bc4c683d..f8904a2256 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteWatcher.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteWatcher.scala @@ -17,6 +17,7 @@ import akka.ConfigurationException import akka.dispatch.{ UnboundedMessageQueueSemantics, RequiresMessageQueue } import akka.actor.InternalActorRef import akka.dispatch.sysmsg.DeathWatchNotification +import akka.actor.Deploy /** * INTERNAL API @@ -32,7 +33,7 @@ private[akka] object RemoteWatcher { unreachableReaperInterval: FiniteDuration, heartbeatExpectedResponseAfter: FiniteDuration): Props = Props(classOf[RemoteWatcher], failureDetector, heartbeatInterval, unreachableReaperInterval, - heartbeatExpectedResponseAfter) + heartbeatExpectedResponseAfter).withDeploy(Deploy.local) case class WatchRemote(watchee: ActorRef, watcher: ActorRef) case class UnwatchRemote(watchee: ActorRef, watcher: ActorRef) diff --git a/akka-remote/src/main/scala/akka/remote/Remoting.scala b/akka-remote/src/main/scala/akka/remote/Remoting.scala index 5446b4a2b7..50e3e86607 100644 --- a/akka-remote/src/main/scala/akka/remote/Remoting.scala +++ b/akka-remote/src/main/scala/akka/remote/Remoting.scala @@ -617,7 +617,7 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends writing: Boolean): ActorRef = { assert(transportMapping contains localAddress) - if (writing) context.watch(context.actorOf(ReliableDeliverySupervisor( + if (writing) context.watch(context.actorOf(ReliableDeliverySupervisor.props( handleOption, localAddress, remoteAddress, @@ -626,7 +626,7 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends AkkaPduProtobufCodec, receiveBuffers).withDispatcher("akka.remote.writer-dispatcher").withDeploy(Deploy.local), "reliableEndpointWriter-" + AddressUrlEncoder(remoteAddress) + "-" + endpointId.next())) - else context.watch(context.actorOf(EndpointWriter( + else context.watch(context.actorOf(EndpointWriter.props( handleOption, localAddress, remoteAddress, diff --git a/akka-remote/src/test/scala/akka/io/ssl/SslTlsSupportSpec.scala b/akka-remote/src/test/scala/akka/io/ssl/SslTlsSupportSpec.scala index 49d2d5dece..8d113bc60b 100644 --- a/akka-remote/src/test/scala/akka/io/ssl/SslTlsSupportSpec.scala +++ b/akka-remote/src/test/scala/akka/io/ssl/SslTlsSupportSpec.scala @@ -110,7 +110,7 @@ class SslTlsSupportSpec extends AkkaSpec { import init._ - val handler = system.actorOf(TcpPipelineHandler(init, connection, probe.ref).withDeploy(Deploy.local), + val handler = system.actorOf(TcpPipelineHandler.props(init, connection, probe.ref).withDeploy(Deploy.local), "client" + counter.incrementAndGet()) probe.send(connection, Tcp.Register(handler)) @@ -166,7 +166,8 @@ class SslTlsSupportSpec extends AkkaSpec { //#server context watch handler //#server - val pipeline = context.actorOf(TcpPipelineHandler(init, sender, handler).withDeploy(Deploy.local)) + val pipeline = context.actorOf(TcpPipelineHandler.props( + init, sender, handler).withDeploy(Deploy.local)) connection ! Tcp.Register(pipeline) //#server