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

Allow internal custom implementations of DeferredBehavior

Browse source 
Pass around context for stashing
This commit is contained in:
Johannes Rudolph 2018-03-01 11:25:49 +01:00 • committed by Konrad `ktoso` Malawski
parent fa05695548
commit a9293b3df2
7 changed files with 48 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

17
akka-actor-typed/src/main/scala/akka/actor/typed/Behavior.scala
View file

@ -179,18 +179,17 @@ object Behavior {
* Not placed in internal.BehaviorImpl because Behavior is sealed.
*/
@InternalApi
@DoNotInherit
private[akka] class DeferredBehavior[T](val factory: SAC[T] ⇒ Behavior[T]) extends Behavior[T] {
/** start the deferred behavior */
@throws(classOf[Exception])
private[akka] abstract class DeferredBehavior[T] extends Behavior[T] {
def apply(ctx: ActorContext[T]): Behavior[T]
}
/** INTERNAL API */
@InternalApi
private[akka] object DeferredBehavior {
def apply[T](factory: SAC[T] ⇒ Behavior[T]) =
new DeferredBehavior[T] {
def apply(ctx: ActorContext[T]): Behavior[T] = factory(ctx.asScala)
override def toString: String = s"Deferred(${LineNumbers(factory)})"
}
object DeferredBehavior {
def apply[T](factory: SAC[T] ⇒ Behavior[T]) =
new DeferredBehavior[T](factory)
}
/**

4
akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventsourcedRecoveringEvents.scala
View file

@ -85,7 +85,7 @@ private[akka] class EventsourcedRecoveringEvents[Command, Event, State](
def onCommand(cmd: Command): Behavior[Any] = {
// during recovery, stash all incoming commands
stash(cmd)
stash(context, cmd)
same
}
@ -111,7 +111,7 @@ private[akka] class EventsourcedRecoveringEvents[Command, Event, State](
onRecoveryFailure(cause, event = None)
case other ⇒
stash(other)
stash(context, other)
Behaviors.same
}
} catch {

4
akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventsourcedRecoveringSnapshot.scala
View file

@ -80,7 +80,7 @@ final class EventsourcedRecoveringSnapshot[Command, Event, State](
def onCommand(cmd: Command): Behavior[Any] = {
// during recovery, stash all incoming commands
stash(cmd)
stash(context, cmd)
Behavior.same
}
@ -124,7 +124,7 @@ final class EventsourcedRecoveringSnapshot[Command, Event, State](
onRecoveryFailure(cause, event = None)
case other ⇒
stash(other)
stash(context, other)
same
}
} catch {

2
akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventsourcedRequestingRecoveryPermit.scala
View file

@ -80,7 +80,7 @@ private[akka] final class EventsourcedRequestingRecoveryPermit[Command, Event, S
becomeRecovering()
case other ⇒
stash(other)
stash(context, other)
Behaviors.same
}
}

2
akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventsourcedRunning.scala
View file

@ -115,7 +115,7 @@ class EventsourcedRunning[Command, Event, State](
def name = "PersistingEvents"
final override def onCommand(c: Command): Behavior[Any] = {
stash(c)
stash(context, c)
same
}

7
akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventsourcedStashManagement.scala
View file

@ -21,7 +21,6 @@ private[akka] trait EventsourcedStashManagement {
protected def log: LoggingAdapter
protected def extension: Persistence
protected def context: ActorContext[Any]
protected val internalStash: StashBuffer[Any]
@ -43,7 +42,7 @@ private[akka] trait EventsourcedStashManagement {
other // the other strategies are supported
}
protected def stash(msg: Any): Unit = {
protected def stash(ctx: ActorContext[Any], msg: Any): Unit = {
if (logLevel != OffLevel) log.log(logLevel, "Stashing message: {}", msg)
try internalStash.stash(msg) catch {
@ -51,7 +50,7 @@ private[akka] trait EventsourcedStashManagement {
internalStashOverflowStrategy match {
case DiscardToDeadLetterStrategy ⇒
val snd: a.ActorRef = a.ActorRef.noSender // FIXME can we improve it somehow?
context.system.deadLetters.tell(DeadLetter(msg, snd, context.self.toUntyped))
ctx.system.deadLetters.tell(DeadLetter(msg, snd, ctx.self.toUntyped))
case ReplyToStrategy(response) ⇒
throw new RuntimeException("ReplyToStrategy does not make sense at all in Akka Typed, since there is no sender()!")
@ -65,7 +64,7 @@ private[akka] trait EventsourcedStashManagement {
protected def tryUnstash(ctx: ActorContext[Any], behavior: Behavior[Any]): Behavior[Any] = {
if (internalStash.nonEmpty) {
log.debug("Unstashing message: {}", internalStash.head.getClass)
internalStash.unstash(context, behavior, 1, ConstantFun.scalaIdentityFunction)
internalStash.unstash(ctx, behavior, 1, ConstantFun.scalaIdentityFunction)
} else behavior
}

46
akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/PersistentBehaviorImpl.scala
View file

@ -1,5 +1,7 @@
package akka.persistence.typed.internal
import akka.actor.typed
import akka.actor.typed.Behavior
import akka.actor.typed.Behavior.DeferredBehavior
import akka.actor.typed.internal.TimerSchedulerImpl
import akka.actor.typed.scaladsl.ActorContext
@ -26,7 +28,29 @@ private[persistence] class PersistentBehaviorImpl[Command, Event, State] private
snapshotPluginId: String,
snapshotWhen: (State, Event, Long) ⇒ Boolean,
recovery: Recovery
) extends DeferredBehavior[Command](ctx ⇒
) extends PersistentBehavior[Command, Event, State] {
def this(
persistenceId: String,
initialState: State,
commandHandler: PersistentBehaviors.CommandHandler[Command, Event, State],
eventHandler: (State, Event) ⇒ State) {
this(
persistenceId,
initialState,
commandHandler,
eventHandler,
recoveryCompleted = ConstantFun.scalaAnyTwoToUnit,
tagger = (_: Event) ⇒ Set.empty[String],
journalPluginId = "" /* default plugin */ ,
snapshotPluginId = "" /* default plugin */ ,
snapshotWhen = ConstantFun.scalaAnyThreeToFalse,
recovery = Recovery()
)
}
override def apply(ctx: typed.ActorContext[Command]): Behavior[Command] = {
DeferredBehavior[Command](ctx ⇒
TimerSchedulerImpl.wrapWithTimers[Command] { timers ⇒
val callbacks = EventsourcedCallbacks[Command, Event, State](
initialState,
@ -49,25 +73,7 @@ private[persistence] class PersistentBehaviorImpl[Command, Event, State] private
pluginIds
).narrow[Command]
}(ctx)) with PersistentBehavior[Command, Event, State] {
def this(
persistenceId: String,
initialState: State,
commandHandler: PersistentBehaviors.CommandHandler[Command, Event, State],
eventHandler: (State, Event) ⇒ State) {
this(
persistenceId,
initialState,
commandHandler,
eventHandler,
recoveryCompleted = ConstantFun.scalaAnyTwoToUnit,
tagger = (_: Event) ⇒ Set.empty[String],
journalPluginId = "" /* default plugin */ ,
snapshotPluginId = "" /* default plugin */ ,
snapshotWhen = ConstantFun.scalaAnyThreeToFalse,
recovery = Recovery()
)
}(ctx))
}
/**