Update Akka to 2.4.12

Author: okumin

build.sbt

@@ -44,7 +44,7 @@ lazy val commonSettings = Seq(
   libraryDependencies := commonDependencies
 )
 
-val akkaVersion = "2.4.0"
+val akkaVersion = "2.4.12"
 val mauricioVersion = "0.2.20"
 
 lazy val commonDependencies = Seq(

core/src/main/scala/akka/persistence/journal/sqlasync/ScalikeJDBCWriteJournal.scala

@@ -49,11 +49,11 @@ private[sqlasync] trait ScalikeJDBCWriteJournal extends AsyncWriteJournal with S
             } yield map.updated(id, persistenceKey)
           }
           (batch, result) = serialize(keys)
-          sql = sql"INSERT INTO $journalTable (persistence_key, sequence_nr, message) VALUES $batch"
           _ <- if (result.forall(_.isFailure)) {
             // No insertion is needed.
             Future.successful(())
           } else {
+            val sql = sql"INSERT INTO $journalTable (persistence_key, sequence_nr, message) VALUES $batch"
             logging(sql).update().future()
           }
         } yield {

core/src/test/scala/akka/persistence/journal/sqlasync/MySQLAsyncJournalSpec.scala

@@ -1,10 +1,10 @@
 package akka.persistence.journal.sqlasync
 
 import akka.actor.Actor
-import akka.persistence.JournalProtocol.{WriteMessageRejected, WriteMessageSuccess, WriteMessages, WriteMessagesSuccessful}
+import akka.persistence.JournalProtocol.{WriteMessageRejected, WriteMessages, WriteMessagesSuccessful}
 import akka.persistence.helper.MySQLInitializer
 import akka.persistence.journal.JournalSpec
-import akka.persistence.{AtomicWrite, PersistentImpl, PersistentRepr}
+import akka.persistence.{AtomicWrite, CapabilityFlag, PersistentImpl, PersistentRepr}
 import akka.testkit.TestProbe
 import com.typesafe.config.ConfigFactory
 import java.io.NotSerializableException
@@ -14,6 +14,8 @@ class MySQLAsyncJournalSpec
   extends JournalSpec(ConfigFactory.load("mysql-application.conf"))
   with MySQLInitializer {
 
+  override protected def supportsRejectingNonSerializableObjects: CapabilityFlag = true
+
   "ScalikeJDBCWriteJournal" must {
     "not execute SQL when all the events is not serializable" in {
       val probe = TestProbe()
@@ -50,40 +52,5 @@ class MySQLAsyncJournalSpec
       }
       probe.expectNoMsg(1.second)
     }
-
-    "handle partial serialization errors" in {
-      val probe = TestProbe()
-
-      val notSerializableEvent = new Object { override def toString = "not serializable" }
-      val messages = (6 to 8).map { i =>
-        val event = if (i == 7) notSerializableEvent else s"b-$i"
-        AtomicWrite(PersistentRepr(
-          payload = event,
-          sequenceNr = i,
-          persistenceId = pid,
-          sender = Actor.noSender,
-          writerUuid = writerUuid
-        ))
-      }
-      journal ! WriteMessages(messages, probe.ref, actorInstanceId)
-      probe.expectMsg(WriteMessagesSuccessful)
-
-      val Pid = pid
-      val WriterUuid = writerUuid
-      probe.expectMsgPF() {
-        case WriteMessageSuccess(PersistentImpl(payload, 6L, Pid, _, _, Actor.noSender, WriterUuid), _) =>
-          payload should be("b-6")
-      }
-      probe.expectMsgPF() {
-        case WriteMessageRejected(PersistentImpl(payload, 7L, Pid, _, _, Actor.noSender, WriterUuid), cause, _) =>
-          payload should be(notSerializableEvent)
-          cause.isInstanceOf[NotSerializableException] should be(true)
-      }
-      probe.expectMsgPF() {
-        case WriteMessageSuccess(PersistentImpl(payload, 8L, Pid, _, _, Actor.noSender, WriterUuid), _) =>
-          payload should be("b-8")
-      }
-      probe.expectNoMsg(1.second)
-    }
   }
 }

core/src/test/scala/akka/persistence/journal/sqlasync/PostgreSQLAsyncJournalSpec.scala

@@ -1,9 +1,12 @@
 package akka.persistence.journal.sqlasync
 
+import akka.persistence.CapabilityFlag
 import akka.persistence.helper.PostgreSQLInitializer
 import akka.persistence.journal.JournalSpec
 import com.typesafe.config.ConfigFactory
 
 class PostgreSQLAsyncJournalSpec
   extends JournalSpec(ConfigFactory.load("postgresql-application.conf"))
-  with PostgreSQLInitializer
+  with PostgreSQLInitializer {
+  override protected def supportsRejectingNonSerializableObjects: CapabilityFlag = true
+}

performance-test/src/test/scala/akka/persistence/journal/sqlasync/MySQLAsyncJournalPerfSpec.scala

@@ -1,5 +1,6 @@
 package akka.persistence.journal.sqlasync
 
+import akka.persistence.CapabilityFlag
 import akka.persistence.helper.MySQLInitializer
 import akka.persistence.journal.JournalPerfSpec
 import com.typesafe.config.ConfigFactory
@@ -9,4 +10,5 @@ class MySQLAsyncJournalPerfSpec
   extends JournalPerfSpec(ConfigFactory.load("mysql-application.conf"))
   with MySQLInitializer {
   override def awaitDurationMillis: Long = 100.seconds.toMillis
+  override protected def supportsRejectingNonSerializableObjects: CapabilityFlag = true
 }

performance-test/src/test/scala/akka/persistence/journal/sqlasync/PostgreSQLAsyncJournalPerfSpec.scala

@@ -1,5 +1,6 @@
 package akka.persistence.journal.sqlasync
 
+import akka.persistence.CapabilityFlag
 import akka.persistence.helper.PostgreSQLInitializer
 import akka.persistence.journal.JournalPerfSpec
 import com.typesafe.config.ConfigFactory
@@ -9,4 +10,5 @@ class PostgreSQLAsyncJournalPerfSpec
   extends JournalPerfSpec(ConfigFactory.load("postgresql-application.conf"))
   with PostgreSQLInitializer {
   override def awaitDurationMillis: Long = 100.seconds.toMillis
+  override protected def supportsRejectingNonSerializableObjects: CapabilityFlag = true
 }