From 8a0a6d9e130cd4553553284871a5a76548eb334c Mon Sep 17 00:00:00 2001 From: Roland Kuhn Date: Tue, 4 Mar 2014 16:09:52 +0100 Subject: [PATCH] +per #3906 use AbstractActor for Java8 Persistence - also rename and link doc chapter --- akka-docs/rst/java/index-actors.rst | 1 + .../java/{persistence-lambda.rst => lambda-persistence.rst} | 6 +++--- .../src/main/scala/akka/persistence/Eventsourced.scala | 3 ++- .../src/main/scala/akka/persistence/Processor.scala | 2 +- akka-persistence/src/main/scala/akka/persistence/View.scala | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) rename akka-docs/rst/java/{persistence-lambda.rst => lambda-persistence.rst} (99%) diff --git a/akka-docs/rst/java/index-actors.rst b/akka-docs/rst/java/index-actors.rst index d343351eec..3bb88e0095 100644 --- a/akka-docs/rst/java/index-actors.rst +++ b/akka-docs/rst/java/index-actors.rst @@ -15,3 +15,4 @@ Actors testing lambda-actors lambda-fsm + lambda-persistence diff --git a/akka-docs/rst/java/persistence-lambda.rst b/akka-docs/rst/java/lambda-persistence.rst similarity index 99% rename from akka-docs/rst/java/persistence-lambda.rst rename to akka-docs/rst/java/lambda-persistence.rst index 9e07239ccb..5637608196 100644 --- a/akka-docs/rst/java/persistence-lambda.rst +++ b/akka-docs/rst/java/lambda-persistence.rst @@ -1,8 +1,8 @@ .. _persistence-lambda-java: -########################################## -Persistence with Java 8 Lambda Expressions -########################################## +###################################### +Persistence (Java with Lambda Support) +###################################### Akka persistence enables stateful actors to persist their internal state so that it can be recovered when an actor diff --git a/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala b/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala index 19953aff59..6e55bde0db 100644 --- a/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala +++ b/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala @@ -10,6 +10,7 @@ import scala.collection.immutable import akka.japi.{ Procedure, Util } import akka.persistence.JournalProtocol._ +import akka.actor.AbstractActor /** * INTERNAL API. @@ -292,7 +293,7 @@ abstract class UntypedEventsourcedProcessor extends UntypedProcessor with Events * [[PersistentBatch]] messages. In this case an `UnsupportedOperationException` is * thrown by the processor. */ -abstract class AbstractEventsourcedProcessor extends EventsourcedProcessor { +abstract class AbstractEventsourcedProcessor extends AbstractActor with EventsourcedProcessor { /** * Java API: asynchronously persists `event`. On successful persistence, `handler` is called with the * persisted event. It is guaranteed that no new commands will be received by a processor diff --git a/akka-persistence/src/main/scala/akka/persistence/Processor.scala b/akka-persistence/src/main/scala/akka/persistence/Processor.scala index d0547240e1..86e42d18f5 100644 --- a/akka-persistence/src/main/scala/akka/persistence/Processor.scala +++ b/akka-persistence/src/main/scala/akka/persistence/Processor.scala @@ -444,4 +444,4 @@ abstract class UntypedProcessor extends UntypedActor with Processor * @see [[Recover]] * @see [[PersistentBatch]] */ -abstract class AbstractProcessor extends Processor +abstract class AbstractProcessor extends AbstractActor with Processor diff --git a/akka-persistence/src/main/scala/akka/persistence/View.scala b/akka-persistence/src/main/scala/akka/persistence/View.scala index b09637197e..63e5e34133 100644 --- a/akka-persistence/src/main/scala/akka/persistence/View.scala +++ b/akka-persistence/src/main/scala/akka/persistence/View.scala @@ -203,4 +203,4 @@ abstract class UntypedView extends UntypedActor with View * * @see [[View]] */ -abstract class AbstractView extends View +abstract class AbstractView extends AbstractActor with View