!act #3920 Remove UntypedActorFactory
This commit is contained in:
parent
54671271e9
commit
7d40ca1840
5 changed files with 3 additions and 18 deletions
|
|
@ -590,7 +590,7 @@ private[akka] class ActorCell(
|
||||||
e match {
|
e match {
|
||||||
case i: InstantiationException ⇒ throw ActorInitializationException(self,
|
case i: InstantiationException ⇒ throw ActorInitializationException(self,
|
||||||
"""exception during creation, this problem is likely to occur because the class of the Actor you tried to create is either,
|
"""exception during creation, this problem is likely to occur because the class of the Actor you tried to create is either,
|
||||||
a non-static inner class (in which case make it a static inner class or use Props(new ...) or Props( new UntypedActorFactory ... )
|
a non-static inner class (in which case make it a static inner class or use Props(new ...) or Props( new Creator ... )
|
||||||
or is missing an appropriate, reachable no-args constructor.
|
or is missing an appropriate, reachable no-args constructor.
|
||||||
""", i.getCause)
|
""", i.getCause)
|
||||||
case x ⇒ throw ActorInitializationException(self, "exception during creation", x)
|
case x ⇒ throw ActorInitializationException(self, "exception during creation", x)
|
||||||
|
|
|
||||||
|
|
@ -278,7 +278,6 @@ trait IndirectActorProducer {
|
||||||
}
|
}
|
||||||
|
|
||||||
private[akka] object IndirectActorProducer {
|
private[akka] object IndirectActorProducer {
|
||||||
val UntypedActorFactoryConsumerClass = classOf[UntypedActorFactoryConsumer]
|
|
||||||
val CreatorFunctionConsumerClass = classOf[CreatorFunctionConsumer]
|
val CreatorFunctionConsumerClass = classOf[CreatorFunctionConsumer]
|
||||||
val CreatorConsumerClass = classOf[CreatorConsumer]
|
val CreatorConsumerClass = classOf[CreatorConsumer]
|
||||||
val TypedCreatorFunctionConsumerClass = classOf[TypedCreatorFunctionConsumer]
|
val TypedCreatorFunctionConsumerClass = classOf[TypedCreatorFunctionConsumer]
|
||||||
|
|
@ -292,8 +291,6 @@ private[akka] object IndirectActorProducer {
|
||||||
clazz match {
|
clazz match {
|
||||||
case TypedCreatorFunctionConsumerClass ⇒
|
case TypedCreatorFunctionConsumerClass ⇒
|
||||||
new TypedCreatorFunctionConsumer(get1stArg, get2ndArg)
|
new TypedCreatorFunctionConsumer(get1stArg, get2ndArg)
|
||||||
case UntypedActorFactoryConsumerClass ⇒
|
|
||||||
new UntypedActorFactoryConsumer(get1stArg)
|
|
||||||
case CreatorFunctionConsumerClass ⇒
|
case CreatorFunctionConsumerClass ⇒
|
||||||
new CreatorFunctionConsumer(get1stArg)
|
new CreatorFunctionConsumer(get1stArg)
|
||||||
case CreatorConsumerClass ⇒
|
case CreatorConsumerClass ⇒
|
||||||
|
|
@ -308,14 +305,6 @@ private[akka] object IndirectActorProducer {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* INTERNAL API
|
|
||||||
*/
|
|
||||||
private[akka] class UntypedActorFactoryConsumer(factory: UntypedActorFactory) extends IndirectActorProducer {
|
|
||||||
override def actorClass = classOf[Actor]
|
|
||||||
override def produce() = factory.create()
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* INTERNAL API
|
* INTERNAL API
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -177,8 +177,3 @@ abstract class UntypedActor extends Actor {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Factory closure for an UntypedActor, to be used with 'Actors.actorOf(factory)'.
|
|
||||||
*/
|
|
||||||
@deprecated("use Creator<T> instead", "2.2")
|
|
||||||
trait UntypedActorFactory extends Creator[Actor] with Serializable
|
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,6 @@ import akka.actor.Terminated;
|
||||||
//#import-terminated
|
//#import-terminated
|
||||||
//#import-untypedActor
|
//#import-untypedActor
|
||||||
import akka.actor.UntypedActor;
|
import akka.actor.UntypedActor;
|
||||||
import akka.actor.UntypedActorFactory;
|
|
||||||
//#import-untypedActor
|
//#import-untypedActor
|
||||||
//#import-stash
|
//#import-stash
|
||||||
import akka.actor.UntypedActorWithStash;
|
import akka.actor.UntypedActorWithStash;
|
||||||
|
|
|
||||||
|
|
@ -42,3 +42,5 @@ The following, previously deprecated, features have been removed:
|
||||||
* Timeout constructor without unit
|
* Timeout constructor without unit
|
||||||
|
|
||||||
* JavaLoggingEventHandler, replaced by JavaLogger
|
* JavaLoggingEventHandler, replaced by JavaLogger
|
||||||
|
|
||||||
|
* UntypedActorFactory
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue