From 10fc413238f874605a01a04665ceac4ed3309fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Andr=C3=A9n?= <johan@markatta.com>
Date: Fri, 21 Sep 2018 10:34:41 +0200
Subject: [PATCH] Some usages of the removed signatures

---
 .../scaladsl/ClusterShardingPersistenceSpec.scala     |  2 +-
 .../typed/ClusterSingletonPersistenceSpec.scala       |  2 +-
 .../typed/scaladsl/PersistentBehaviors.scala          | 11 -----------
 .../typed/javadsl/PersistentActorJavaDslTest.java     |  1 -
 .../typed/InDepthPersistentBehaviorSpec.scala         |  6 ++----
 5 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala
index 5c529ab5ad..4609fb5ea7 100644
--- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala
+++ b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala
@@ -47,7 +47,7 @@ object ClusterShardingPersistenceSpec {
     PersistentBehaviors.receive[Command, String, String](
       entityId,
       emptyState = "",
-      commandHandler = (_, state, cmd) ⇒ cmd match {
+      commandHandler = (state, cmd) ⇒ cmd match {
         case Add(s) ⇒ Effect.persist(s)
         case Get(replyTo) ⇒
           replyTo ! s"$entityId:$state"
diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPersistenceSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPersistenceSpec.scala
index e86d03afb0..9b127857aa 100644
--- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPersistenceSpec.scala
+++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPersistenceSpec.scala
@@ -39,7 +39,7 @@ object ClusterSingletonPersistenceSpec {
     PersistentBehaviors.receive[Command, String, String](
       persistenceId = "TheSingleton",
       emptyState = "",
-      commandHandler = (_, state, cmd) ⇒ cmd match {
+      commandHandler = (state, cmd) ⇒ cmd match {
         case Add(s) ⇒ Effect.persist(s)
         case Get(replyTo) ⇒
           replyTo ! state
diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/PersistentBehaviors.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/PersistentBehaviors.scala
index 74498001b8..161c48df80 100644
--- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/PersistentBehaviors.scala
+++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/PersistentBehaviors.scala
@@ -67,17 +67,6 @@ object PersistentBehaviors {
 
   }
 
-  /**
-   * INTERNAL API
-   */
-  @InternalApi private[akka] final class ByStateCommandHandler[Command, Event, State](
-    choice: State ⇒ CommandHandler[Command, Event, State])
-    extends CommandHandler[Command, Event, State] {
-
-    override def apply(state: State, cmd: Command): Effect[Event, State] =
-      choice(state)(state, cmd)
-
-  }
 }
 
 trait PersistentBehavior[Command, Event, State] extends DeferredBehavior[Command] {
diff --git a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorJavaDslTest.java b/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorJavaDslTest.java
index 97b5a7bbf9..a1b99e17cd 100644
--- a/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorJavaDslTest.java
+++ b/akka-persistence-typed/src/test/java/akka/persistence/typed/javadsl/PersistentActorJavaDslTest.java
@@ -506,5 +506,4 @@ public class PersistentActorJavaDslTest extends JUnitSuite {
   }
   //event-wrapper
 
-  // FIXME test with by state command handler
 }
diff --git a/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/InDepthPersistentBehaviorSpec.scala b/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/InDepthPersistentBehaviorSpec.scala
index 41aad9f1d0..478af65ca3 100644
--- a/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/InDepthPersistentBehaviorSpec.scala
+++ b/akka-persistence-typed/src/test/scala/docs/akka/persistence/typed/InDepthPersistentBehaviorSpec.scala
@@ -94,10 +94,8 @@ object InDepthPersistentBehaviorSpec {
 
   //#by-state-command-handler
   private val commandHandler: (BlogState, BlogCommand) ⇒ Effect[BlogEvent, BlogState] = { (state, command) ⇒
-    state match {
-      case state if state.isEmpty  ⇒ initial(state, command)
-      case state if !state.isEmpty ⇒ postAdded(state, command)
-    }
+    if (state.isEmpty) initial(state, command)
+    else postAdded(state, command)
   }
   //#by-state-command-handler