feedback

akka · Jul 5, 2019 · 83e2bbb · 83e2bbb
1 parent decf338
commit 83e2bbb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/akka-actor/src/main/scala/akka/util/OptionVal.scala b/akka-actor/src/main/scala/akka/util/OptionVal.scala
@@ -53,6 +53,12 @@ private[akka] final class OptionVal[+A](val x: A) extends AnyVal {
   def getOrElse[B >: A](default: B): B =
     if (x == null) default else x
 
+  /**
+   * Convert to `scala.Option`
+   */
+  def toOption: Option[A] =
+    Option(x)
+
   def contains[B >: A](it: B): Boolean =
     x != null && x == it
 

diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/EventAdapter.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/EventAdapter.scala
@@ -14,8 +14,9 @@ import akka.annotation.InternalApi
  * Typical use cases include (but are not limited to):
  * <ul>
  *   <li>extracting events from "envelopes"</li>
- *   <li>manually converting to the Journals storage format, such as JSON, BSON or any specialised binary format</li>
- *   <li>adapting incoming events from a "data model" to the "domain model"</li>
+ *   <li>adapting events from a "domain model" to the "data model", e.g. converting to the Journals storage format,
+ *       such as JSON, BSON or any specialised binary format</li>
+ *   <li>adapting events from a "data model" to the "domain model"</li>
  *   <li>adding metadata that is understood by the journal</li>
  *   <li>migration by splitting up events into sequences of other events</li>
  *   <li>migration filtering out unused events, or replacing an event with another</li>

diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplayingEvents.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplayingEvents.scala
@@ -130,7 +130,7 @@ private[akka] final class ReplayingEvents[C, E, S](
           } catch {
             case NonFatal(ex) =>
               state = state.copy(repr.sequenceNr)
-              onRecoveryFailure(ex, Option(eventForErrorReporting.getOrElse(null)))
+              onRecoveryFailure(ex, eventForErrorReporting.toOption)
           }
 
         case RecoverySuccess(highestSeqNr) =>

diff --git a/akka-persistence/src/main/scala/akka/persistence/Persistent.scala b/akka-persistence/src/main/scala/akka/persistence/Persistent.scala
@@ -115,12 +115,12 @@ final case class AtomicWrite(payload: immutable.Seq[PersistentRepr]) extends Per
    * old records from v2.3 may have this as `true` if
    * it was a non-permanent delete.
    */
-  def deleted: Boolean
+  def deleted: Boolean // FIXME deprecate, issue #27278
 
   /**
    * Not used, can be `null`
    */
-  def sender: ActorRef
+  def sender: ActorRef // FIXME deprecate, issue #27278
 
   /**
    * Creates a new copy of this [[PersistentRepr]].