Address review comments

apache · Oct 7, 2024 · 7b86e21 · 7b86e21
1 parent fb68e0e
commit 7b86e21
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 24 deletions.
diff --git a/...cala/org/apache/pekko/persistence/testkit/internal/SnapshotStorageEmulatorExtension.scala b/...cala/org/apache/pekko/persistence/testkit/internal/SnapshotStorageEmulatorExtension.scala
@@ -44,12 +44,13 @@ private[testkit] object SnapshotStorageEmulatorExtension extends ExtensionId[Sna
 @InternalApi
 final class SnapshotStorageEmulatorExtension(system: ExtendedActorSystem) extends Extension {
   private val stores = new ConcurrentHashMap[String, SnapshotStorage]()
+  private lazy val shouldCreateSerializedSnapshotStorage = SnapshotTestKit.Settings(system).serialize
 
   def storageFor(key: String): SnapshotStorage =
     stores.computeIfAbsent(key,
       _ => {
         // we don't really care about the key here, we just want separate instances
-        if (SnapshotTestKit.Settings(system).serialize) {
+        if (shouldCreateSerializedSnapshotStorage) {
           new SerializedSnapshotStorageImpl(system)
         } else {
           new SimpleSnapshotStorageImpl

diff --git a/...it/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/RuntimeJournalsSpec.scala b/...it/src/test/scala/org/apache/pekko/persistence/testkit/scaladsl/RuntimeJournalsSpec.scala
@@ -1,26 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.pekko.persistence.testkit.scaladsl
 
 import com.typesafe.config.ConfigFactory
-import org.apache.pekko.Done
-import org.apache.pekko.actor.testkit.typed.scaladsl.LogCapturing
-import org.apache.pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
-import org.apache.pekko.actor.typed.ActorRef
-import org.apache.pekko.actor.typed.Behavior
-import org.apache.pekko.actor.typed.scaladsl.adapter._
-import org.apache.pekko.persistence.JournalProtocol.RecoverySuccess
-import org.apache.pekko.persistence.JournalProtocol.ReplayMessages
-import org.apache.pekko.persistence.JournalProtocol.ReplayedMessage
-import org.apache.pekko.persistence.Persistence
-import org.apache.pekko.persistence.SelectedSnapshot
-import org.apache.pekko.persistence.SnapshotProtocol.LoadSnapshot
-import org.apache.pekko.persistence.SnapshotProtocol.LoadSnapshotResult
-import org.apache.pekko.persistence.SnapshotSelectionCriteria
-import org.apache.pekko.persistence.testkit.PersistenceTestKitPlugin
-import org.apache.pekko.persistence.testkit.PersistenceTestKitSnapshotPlugin
-import org.apache.pekko.persistence.typed.PersistenceId
-import org.apache.pekko.persistence.typed.scaladsl.Effect
-import org.apache.pekko.persistence.typed.scaladsl.EventSourcedBehavior
-import org.apache.pekko.persistence.typed.scaladsl.RetentionCriteria
+import org.apache.pekko
+import pekko.Done
+import pekko.actor.testkit.typed.scaladsl.LogCapturing
+import pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
+import pekko.actor.typed.ActorRef
+import pekko.actor.typed.Behavior
+import pekko.actor.typed.scaladsl.adapter._
+import pekko.persistence.JournalProtocol.RecoverySuccess
+import pekko.persistence.JournalProtocol.ReplayMessages
+import pekko.persistence.JournalProtocol.ReplayedMessage
+import pekko.persistence.Persistence
+import pekko.persistence.SelectedSnapshot
+import pekko.persistence.SnapshotProtocol.LoadSnapshot
+import pekko.persistence.SnapshotProtocol.LoadSnapshotResult
+import pekko.persistence.SnapshotSelectionCriteria
+import pekko.persistence.testkit.PersistenceTestKitPlugin
+import pekko.persistence.testkit.PersistenceTestKitSnapshotPlugin
+import pekko.persistence.typed.PersistenceId
+import pekko.persistence.typed.scaladsl.Effect
+import pekko.persistence.typed.scaladsl.EventSourcedBehavior
+import pekko.persistence.typed.scaladsl.RetentionCriteria
 import org.scalatest.Inside
 import org.scalatest.wordspec.AnyWordSpecLike
 

diff --git a/...ence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/BehaviorSetup.scala b/...ence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/BehaviorSetup.scala
@@ -16,9 +16,10 @@ package org.apache.pekko.persistence.typed.internal
 import com.typesafe.config.ConfigFactory
 
 import scala.concurrent.ExecutionContext
+import scala.concurrent.duration.FiniteDuration
 import scala.util.control.NonFatal
 import org.apache.pekko
-import org.apache.pekko.util.Helpers.ConfigOps
+import pekko.util.Helpers.ConfigOps
 import pekko.actor.Cancellable
 import pekko.actor.typed.Signal
 import pekko.actor.typed.scaladsl.ActorContext
@@ -35,8 +36,6 @@ import pekko.util.OptionVal
 import org.slf4j.Logger
 import org.slf4j.MDC
 
-import scala.concurrent.duration.FiniteDuration
-
 /**
  * INTERNAL API
  */