raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge pull request #22799 from stanislav-chetvertkov/wip-22718-2

Browse source 
Rename `management` to `receiveSignal` and `message` to `receiveMessa…
This commit is contained in:
Patrik Nordwall 2017-04-27 08:35:43 +02:00 • committed by GitHub
commit ef1ea6f0ea
4 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
akka-typed/src/main/java/akka/typed/javadsl/Actor.java
View file

@ -51,12 +51,12 @@ public abstract class Actor {
}
@Override
public Behavior<T> management(akka.typed.ActorContext<T> ctx, Signal msg) throws Exception {
public Behavior<T> receiveSignal(akka.typed.ActorContext<T> ctx, Signal msg) throws Exception {
return signal.apply(ctx, msg);
}
@Override
public Behavior<T> message(akka.typed.ActorContext<T> ctx, T msg) throws Exception {
public Behavior<T> receiveMessage(akka.typed.ActorContext<T> ctx, T msg) throws Exception {
return message.apply(ctx, msg);
}
}
@ -85,13 +85,13 @@ public abstract class Actor {
}
@Override
public Behavior<T> management(akka.typed.ActorContext<T> ctx, Signal signal) throws Exception {
public Behavior<T> receiveSignal(akka.typed.ActorContext<T> ctx, Signal signal) throws Exception {
this.signal.apply(ctx, signal);
return canonicalize(Behavior.interpretSignal(behavior, ctx, signal));
}
@Override
public Behavior<T> message(akka.typed.ActorContext<T> ctx, T msg) throws Exception {
public Behavior<T> receiveMessage(akka.typed.ActorContext<T> ctx, T msg) throws Exception {
message.apply(ctx, msg);
return canonicalize(Behavior.interpretMessage(behavior, ctx, msg));
}
@ -368,7 +368,7 @@ public abstract class Actor {
*/
static public abstract class MutableBehavior<T> extends ExtensibleBehavior<T> {
@Override
final public Behavior<T> message(akka.typed.ActorContext<T> ctx, T msg) throws Exception {
final public Behavior<T> receiveMessage(akka.typed.ActorContext<T> ctx, T msg) throws Exception {
return onMessage(msg);
}
@ -386,7 +386,7 @@ public abstract class Actor {
public abstract Behavior<T> onMessage(T msg) throws Exception;
@Override
final public Behavior<T> management(akka.typed.ActorContext<T> ctx, Signal msg) throws Exception {
final public Behavior<T> receiveSignal(akka.typed.ActorContext<T> ctx, Signal msg) throws Exception {
return onSignal(msg);
}

8
akka-typed/src/main/scala/akka/typed/Behavior.scala
View file

@ -57,7 +57,7 @@ abstract class ExtensibleBehavior[T] extends Behavior[T] {
* the special objects with real Behaviors.
*/
@throws(classOf[Exception])
def management(ctx: ActorContext[T], msg: Signal): Behavior[T]
def receiveSignal(ctx: ActorContext[T], msg: Signal): Behavior[T]
/**
* Process an incoming message and return the next behavior.
@ -73,7 +73,7 @@ abstract class ExtensibleBehavior[T] extends Behavior[T] {
* the special objects with real Behaviors.
*/
@throws(classOf[Exception])
def message(ctx: ActorContext[T], msg: T): Behavior[T]
def receiveMessage(ctx: ActorContext[T], msg: T): Behavior[T]
}
@ -203,8 +203,8 @@ object Behavior {
case EmptyBehavior ⇒ UnhandledBehavior.asInstanceOf[Behavior[T]]
case ext: ExtensibleBehavior[T] @unchecked ⇒
val possiblyDeferredResult = msg match {
case signal: Signal ⇒ ext.management(ctx, signal)
case msg ⇒ ext.message(ctx, msg.asInstanceOf[T])
case signal: Signal ⇒ ext.receiveSignal(ctx, signal)
case msg ⇒ ext.receiveMessage(ctx, msg.asInstanceOf[T])
}
undefer(possiblyDeferredResult, ctx)
}

8
akka-typed/src/main/scala/akka/typed/patterns/Restarter.scala
View file

@ -40,7 +40,7 @@ final case class Restarter[T, Thr <: Throwable: ClassTag](initialBehavior: Behav
private def preStart(b: Behavior[T], ctx: ActorContext[T]): Behavior[T] =
Behavior.undefer(b, ctx)
override def management(ctx: ActorContext[T], signal: Signal): Behavior[T] = {
override def receiveSignal(ctx: ActorContext[T], signal: Signal): Behavior[T] = {
val startedBehavior = preStart(behavior, ctx)
val b =
try {
@ -53,7 +53,7 @@ final case class Restarter[T, Thr <: Throwable: ClassTag](initialBehavior: Behav
canonical(b, ctx)
}
override def message(ctx: ActorContext[T], msg: T): Behavior[T] = {
override def receiveMessage(ctx: ActorContext[T], msg: T): Behavior[T] = {
val startedBehavior = preStart(behavior, ctx)
val b =
try {
@ -87,7 +87,7 @@ final case class MutableRestarter[T, Thr <: Throwable: ClassTag](initialBehavior
validateAsInitial(undefer(initialBehavior, ctx))
}
override def management(ctx: ActorContext[T], signal: Signal): Behavior[T] = {
override def receiveSignal(ctx: ActorContext[T], signal: Signal): Behavior[T] = {
startCurrent(ctx)
current =
try {
@ -100,7 +100,7 @@ final case class MutableRestarter[T, Thr <: Throwable: ClassTag](initialBehavior
if (Behavior.isAlive(current)) this else Stopped
}
override def message(ctx: ActorContext[T], msg: T): Behavior[T] = {
override def receiveMessage(ctx: ActorContext[T], msg: T): Behavior[T] = {
startCurrent(ctx)
current =
try Behavior.interpretMessage(current, ctx, msg)

16
akka-typed/src/main/scala/akka/typed/scaladsl/Actor.scala
View file

@ -191,10 +191,10 @@ object Actor {
if (next eq behavior) Same else Widened(next, matcher)
} else Stopped
override def management(ctx: AC[U], signal: Signal): Behavior[U] =
override def receiveSignal(ctx: AC[U], signal: Signal): Behavior[U] =
postProcess(Behavior.interpretSignal(behavior, ctx.as[T], signal), ctx.as[T])
override def message(ctx: AC[U], msg: U): Behavior[U] =
override def receiveMessage(ctx: AC[U], msg: U): Behavior[U] =
matcher.applyOrElse(msg, nullFun) match {
case null ⇒ Unhandled
case transformed ⇒ postProcess(Behavior.interpretMessage(behavior, ctx.as[T], transformed), ctx.as[T])
@ -242,7 +242,7 @@ object Actor {
*/
abstract class MutableBehavior[T] extends ExtensibleBehavior[T] {
@throws(classOf[Exception])
override final def message(ctx: akka.typed.ActorContext[T], msg: T): Behavior[T] =
override final def receiveMessage(ctx: akka.typed.ActorContext[T], msg: T): Behavior[T] =
onMessage(msg)
/**
@ -260,7 +260,7 @@ object Actor {
def onMessage(msg: T): Behavior[T]
@throws(classOf[Exception])
override final def management(ctx: akka.typed.ActorContext[T], msg: Signal): Behavior[T] =
override final def receiveSignal(ctx: akka.typed.ActorContext[T], msg: Signal): Behavior[T] =
onSignal(msg)
/**
@ -339,8 +339,8 @@ object Actor {
onMessage: (ActorContext[T], T) ⇒ Behavior[T],
onSignal: (ActorContext[T], Signal) ⇒ Behavior[T] = Behavior.unhandledSignal.asInstanceOf[(ActorContext[T], Signal) ⇒ Behavior[T]])
extends ExtensibleBehavior[T] {
override def management(ctx: AC[T], msg: Signal): Behavior[T] = onSignal(ctx, msg)
override def message(ctx: AC[T], msg: T) = onMessage(ctx, msg)
override def receiveSignal(ctx: AC[T], msg: Signal): Behavior[T] = onSignal(ctx, msg)
override def receiveMessage(ctx: AC[T], msg: T) = onMessage(ctx, msg)
override def toString = s"Immutable(${LineNumbers(onMessage)})"
}
@ -359,11 +359,11 @@ object Actor {
else if ((behv eq SameBehavior) || (behv eq this)) Same
else if (isAlive(behv)) Tap(onMessage, onSignal, behv)
else Stopped
override def management(ctx: AC[T], signal: Signal): Behavior[T] = {
override def receiveSignal(ctx: AC[T], signal: Signal): Behavior[T] = {
onSignal(ctx, signal)
canonical(Behavior.interpretSignal(behavior, ctx, signal))
}
override def message(ctx: AC[T], msg: T): Behavior[T] = {
override def receiveMessage(ctx: AC[T], msg: T): Behavior[T] = {
onMessage(ctx, msg)
canonical(Behavior.interpretMessage(behavior, ctx, msg))
}