!per #3704 Persistence improvements

- Channel enhancements (#3773):
- Live read models (#3776):
- Batch-oriented journal plugin API (#3804):
- Batching of confirmations and deletions
- Message deletion enhancements (more efficient range deletions)

akka-persistence/src/test/scala/akka/persistence/ProcessorChannelSpec.scala

@@ -12,8 +12,6 @@ import com.typesafe.config._
 import akka.actor._
 import akka.testkit._
 
-import akka.persistence.JournalProtocol.Confirm
-
 object ProcessorChannelSpec {
   class TestProcessor(name: String) extends NamedProcessor(name) {
     val destination = context.actorOf(Props[TestDestination])
@@ -23,10 +21,10 @@ object ProcessorChannelSpec {
       case m @ Persistent(s: String, _) if s.startsWith("a") ⇒
         // forward to destination via channel,
         // destination replies to initial sender
-        channel forward Deliver(m.withPayload(s"fw: ${s}"), destination)
+        channel forward Deliver(m.withPayload(s"fw: ${s}"), destination.path)
       case m @ Persistent(s: String, _) if s.startsWith("b") ⇒
         // reply to sender via channel
-        channel ! Deliver(m.withPayload(s"re: ${s}"), sender)
+        channel ! Deliver(m.withPayload(s"re: ${s}"), sender.path)
     }
   }
 
@@ -40,7 +38,7 @@ object ProcessorChannelSpec {
     val channel = context.actorOf(Channel.props("channel", ChannelSettings(redeliverMax = 1, redeliverInterval = 100 milliseconds)))
 
     def receive = {
-      case p: Persistent ⇒ channel ! Deliver(p, destination)
+      case p: Persistent ⇒ channel ! Deliver(p, destination.path)
       case "replay"      ⇒ throw new TestException("replay requested")
     }
   }
@@ -52,7 +50,7 @@ object ProcessorChannelSpec {
 
     def handleEvent(event: String) = {
       events = event :: events
-      channel ! Deliver(Persistent(event), destination)
+      channel ! Deliver(Persistent(event), destination.path)
     }
 
     def receiveReplay: Receive = {
@@ -83,10 +81,10 @@ abstract class ProcessorChannelSpec(config: Config) extends AkkaSpec(config) wit
   }
 
   def subscribeToConfirmation(probe: TestProbe): Unit =
-    system.eventStream.subscribe(probe.ref, classOf[Confirm])
+    system.eventStream.subscribe(probe.ref, classOf[Delivered])
 
   def awaitConfirmation(probe: TestProbe): Unit =
-    probe.expectMsgType[Confirm]
+    probe.expectMsgType[Delivered]
 
   def createTestProcessor(): ActorRef =
     system.actorOf(Props(classOf[TestProcessor], name))