improve AbstractActor, #21717

* Receive class that wraps PartialFunction, to avoid
  scary scala types
* move AbstractActorContext to AbstractActor.ActorContext
* converting docs, many, many UntypedActor
* removing UntypedActor docs
* add unit test for ReceiveBuilder
* MiMa filters
* consistent use of getContext(), self(), sender()
* rename cross references
* migration guide
* skip samples for now
* improve match type safetyi, add matchUnchecked
  * the `? extends P` caused code like this to compile:
    `match(String.class, (Integer i) -> {})`
  * added matchUnchecked, since it can still be useful (um, convenient)
    to be able to do:
    `matchUnchecked(List.class, (List<String> list) -> {})`
* eleminate some scala.Option
  * preRestart
  * findChild
  * ActorIdentity.getActorRef
This commit is contained in:
Patrik Nordwall 2016-12-13 10:59:29 +01:00
parent 3617fe8b41
commit 4bd6b7aab1
157 changed files with 3290 additions and 8882 deletions

View file

@ -10,11 +10,11 @@ import akka.pattern.BackoffSupervisor;
import akka.persistence.*;
import akka.persistence.journal.EventAdapter;
import akka.persistence.journal.EventSeq;
import scala.Option;
import scala.concurrent.duration.Duration;
import scala.PartialFunction;
import scala.runtime.BoxedUnit;
import java.io.Serializable;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
public class LambdaPersistenceDocTest {
@ -42,7 +42,7 @@ public class LambdaPersistenceDocTest {
//#recover-on-restart-disabled
@Override
public void preRestart(Throwable reason, Option<Object> message) {}
public void preRestart(Throwable reason, Optional<Object> message) {}
//#recover-on-restart-disabled
}
@ -65,14 +65,14 @@ public class LambdaPersistenceDocTest {
//#persistence-id-override
@Override
public PartialFunction<Object, BoxedUnit> receiveCommand() {
return ReceiveBuilder.
public Receive createReceive() {
return receiveBuilder().
match(String.class, cmd -> {/* ... */}).build();
}
@Override
public PartialFunction<Object, BoxedUnit> receiveRecover() {
return ReceiveBuilder.
public Receive createReceiveRecover() {
return receiveBuilder().
match(String.class, evt -> {/* ... */}).build();
}
@ -85,8 +85,8 @@ public class LambdaPersistenceDocTest {
return "my-stable-persistence-id";
}
@Override public PartialFunction<Object, BoxedUnit> receiveRecover() {
return ReceiveBuilder.
@Override public Receive createReceiveRecover() {
return receiveBuilder().
match(RecoveryCompleted.class, r -> {
// perform init after recovery, before any other messages
// ...
@ -94,8 +94,8 @@ public class LambdaPersistenceDocTest {
match(String.class, this::handleEvent).build();
}
@Override public PartialFunction<Object, BoxedUnit> receiveCommand() {
return ReceiveBuilder.
@Override public Receive createReceive() {
return receiveBuilder().
match(String.class, s -> s.equals("cmd"),
s -> persist("evt", this::handleEvent)).build();
}
@ -128,7 +128,7 @@ public class LambdaPersistenceDocTest {
Duration.create(3, TimeUnit.SECONDS),
Duration.create(30, TimeUnit.SECONDS),
0.2);
context().actorOf(props, "mySupervisor");
getContext().actorOf(props, "mySupervisor");
super.preStart();
}
//#backoff
@ -188,8 +188,8 @@ public class LambdaPersistenceDocTest {
}
@Override
public PartialFunction<Object, BoxedUnit> receiveCommand() {
return ReceiveBuilder.
public Receive createReceive() {
return receiveBuilder().
match(String.class, s -> {
persist(new MsgSent(s), evt -> updateState(evt));
}).
@ -200,8 +200,8 @@ public class LambdaPersistenceDocTest {
}
@Override
public PartialFunction<Object, BoxedUnit> receiveRecover() {
return ReceiveBuilder.
public Receive createReceiveRecover() {
return receiveBuilder().
match(Object.class, evt -> updateState(evt)).build();
}
@ -217,13 +217,14 @@ public class LambdaPersistenceDocTest {
}
class MyDestination extends AbstractActor {
public MyDestination() {
receive(ReceiveBuilder.
match(Msg.class, msg -> {
@Override
public Receive createReceive() {
return receiveBuilder()
.match(Msg.class, msg -> {
// ...
sender().tell(new Confirm(msg.deliveryId), self());
}).build()
);
})
.build();
}
}
//#at-least-once-example
@ -236,8 +237,8 @@ public class LambdaPersistenceDocTest {
//#save-snapshot
private Object state;
@Override public PartialFunction<Object, BoxedUnit> receiveCommand() {
return ReceiveBuilder.
@Override public Receive createReceive() {
return receiveBuilder().
match(String.class, s -> s.equals("snap"),
s -> saveSnapshot(state)).
match(SaveSnapshotSuccess.class, ss -> {
@ -255,8 +256,8 @@ public class LambdaPersistenceDocTest {
return "persistence-id";
}
@Override public PartialFunction<Object, BoxedUnit> receiveRecover() {
return ReceiveBuilder.
@Override public Receive createReceiveRecover() {
return receiveBuilder().
match(RecoveryCompleted.class, r -> {/* ...*/}).build();
}
@ -279,8 +280,8 @@ public class LambdaPersistenceDocTest {
//#snapshot-offer
private Object state;
@Override public PartialFunction<Object, BoxedUnit> receiveRecover() {
return ReceiveBuilder.
@Override public Receive createReceiveRecover() {
return receiveBuilder().
match(SnapshotOffer.class, s -> {
state = s.snapshot();
// ...
@ -293,21 +294,22 @@ public class LambdaPersistenceDocTest {
return "persistence-id";
}
@Override public PartialFunction<Object, BoxedUnit> receiveCommand() {
return ReceiveBuilder.
@Override public Receive createReceive() {
return receiveBuilder().
match(String.class, s -> {/* ...*/}).build();
}
}
class MyActor extends AbstractActor {
ActorRef persistentActor;
private final ActorRef persistentActor =
getContext().actorOf(Props.create(MyPersistentActor.class));
public MyActor() {
persistentActor = context().actorOf(Props.create(MyPersistentActor.class));
receive(ReceiveBuilder.
match(Object.class, o -> {/* ... */}).build()
);
@Override
public Receive createReceive() {
return receiveBuilder()
.match(Object.class, o -> {/* ... */})
.build();
}
}
};
@ -331,13 +333,13 @@ public class LambdaPersistenceDocTest {
});
}
@Override public PartialFunction<Object, BoxedUnit> receiveRecover() {
return ReceiveBuilder.
@Override public Receive createReceiveRecover() {
return receiveBuilder().
match(String.class, this::handleCommand).build();
}
@Override public PartialFunction<Object, BoxedUnit> receiveCommand() {
return ReceiveBuilder.
@Override public Receive createReceive() {
return receiveBuilder().
match(String.class, this::handleCommand).build();
}
}
@ -383,13 +385,13 @@ public class LambdaPersistenceDocTest {
});
}
@Override public PartialFunction<Object, BoxedUnit> receiveRecover() {
return ReceiveBuilder.
@Override public Receive createReceiveRecover() {
return receiveBuilder().
match(String.class, this::handleCommand).build();
}
@Override public PartialFunction<Object, BoxedUnit> receiveCommand() {
return ReceiveBuilder.
@Override public Receive createReceive() {
return receiveBuilder().
match(String.class, this::handleCommand).build();
}
}
@ -424,15 +426,15 @@ public class LambdaPersistenceDocTest {
return "my-stable-persistence-id";
}
@Override public PartialFunction<Object, BoxedUnit> receiveCommand() {
return ReceiveBuilder.matchAny(event -> {}).build();
@Override public Receive createReceive() {
return receiveBuilder().matchAny(event -> {}).build();
}
//#nested-persist-persist
@Override public PartialFunction<Object, BoxedUnit> receiveRecover() {
@Override public Receive createReceiveRecover() {
final Procedure<String> replyToSender = event -> sender().tell(event, self());
return ReceiveBuilder
return receiveBuilder()
.match(String.class, msg -> {
persist(String.format("%s-outer-1", msg), event -> {
sender().tell(event, self());
@ -477,15 +479,17 @@ public class LambdaPersistenceDocTest {
return "my-stable-persistence-id";
}
@Override public PartialFunction<Object, BoxedUnit> receiveCommand() {
return ReceiveBuilder.matchAny(event -> {}).build();
@Override
public Receive createReceiveRecover() {
return receiveBuilder().matchAny(event -> {}).build();
}
//#nested-persistAsync-persistAsync
@Override public PartialFunction<Object, BoxedUnit> receiveRecover() {
@Override
public Receive createReceive() {
final Procedure<String> replyToSender = event -> sender().tell(event, self());
return ReceiveBuilder
return receiveBuilder()
.match(String.class, msg -> {
persistAsync(String.format("%s-outer-1", msg ), event -> {
sender().tell(event, self());
@ -539,10 +543,10 @@ public class LambdaPersistenceDocTest {
}
@Override
public PartialFunction<Object, BoxedUnit> receiveCommand() {
return ReceiveBuilder
public Receive createReceive() {
return receiveBuilder()
.match(Shutdown.class, shutdown -> {
context().stop(self());
getContext().stop(self());
})
.match(String.class, msg -> {
System.out.println(msg);
@ -552,8 +556,8 @@ public class LambdaPersistenceDocTest {
}
@Override
public PartialFunction<Object, BoxedUnit> receiveRecover() {
return ReceiveBuilder.matchAny(any -> {}).build();
public Receive createReceiveRecover() {
return receiveBuilder().matchAny(any -> {}).build();
}
}