Update Akka.NET and Akka.Hosting to 1.5.0-beta6 (#239)

* [bug] `object.Message.Match()` * [fix] remove `Match()` * [Obsolete] `protected override void Dispose(bool disposing)` * Revert "[Obsolete] `protected override void Dispose(bool disposing)`" This reverts commit 2565837. * Update Akka.NET 1.5.0-beta6 - change `Dispose(bool disposing)` to `AfterAll()` * Roll back docker image tag to 6.0.13 It seems like the fixture class isn't compatible with Redis 7.x * Fix fixture class --------- Co-authored-by: Gregorius Soedharmo <arkatufus@yahoo.com>
akkadotnet · Mar 2, 2023 · bfcfe63 · bfcfe63
1 parent 3b29310
commit bfcfe63
Show file tree

Hide file tree

Showing 22 changed files with 54 additions and 47 deletions.
diff --git a/src/Akka.Persistence.Redis.Cluster.Tests/Query/RedisCurrentEventsByPersistenceIdSpec.cs b/src/Akka.Persistence.Redis.Cluster.Tests/Query/RedisCurrentEventsByPersistenceIdSpec.cs
@@ -36,10 +36,10 @@ public RedisCurrentEventsByPersistenceIdSpec(ITestOutputHelper output, RedisClus
             ReadJournal = Sys.ReadJournalFor<RedisReadJournal>(RedisReadJournal.Identifier);
         }
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
             DbUtils.Clean();
-            base.Dispose(disposing);
+            base.AfterAll();
         }
     }
 }
diff --git a/src/Akka.Persistence.Redis.Cluster.Tests/Query/RedisEventsByPersistenceIdSpec.cs b/src/Akka.Persistence.Redis.Cluster.Tests/Query/RedisEventsByPersistenceIdSpec.cs
@@ -38,10 +38,10 @@ public RedisEventsByPersistenceIdSpec(ITestOutputHelper output, RedisClusterFixt
             ReadJournal = Sys.ReadJournalFor<RedisReadJournal>(RedisReadJournal.Identifier);
         }
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
             DbUtils.Clean();
-            base.Dispose(disposing);
+            base.AfterAll();
         }
     }
 }
diff --git a/src/Akka.Persistence.Redis.Cluster.Tests/RedisClusterFixture.cs b/src/Akka.Persistence.Redis.Cluster.Tests/RedisClusterFixture.cs
@@ -39,7 +39,7 @@ public RedisClusterFixture()
         }
 
         protected string ImageName => "grokzen/redis-cluster";
-        protected string Tag => "latest";
+        protected string Tag => "6.0.13";
         protected string RedisImageName => $"{ImageName}:{Tag}";
 
         public string ConnectionString { get; private set; }
@@ -55,7 +55,7 @@ public async Task InitializeAsync()
             });
             if (images.Count == 0)
                 await Client.Images.CreateImageAsync(
-                    new ImagesCreateParameters {FromImage = RedisImageName, Tag = "latest"}, null,
+                    new ImagesCreateParameters {FromImage = RedisImageName, Tag = Tag}, null,
                     new Progress<JSONMessage>(message =>
                     {
                         Console.WriteLine(!string.IsNullOrEmpty(message.ErrorMessage)

diff --git a/src/Akka.Persistence.Redis.Cluster.Tests/RedisJournalDefaultDatabaseSpec.cs b/src/Akka.Persistence.Redis.Cluster.Tests/RedisJournalDefaultDatabaseSpec.cs
@@ -50,9 +50,9 @@ public RedisJournalDefaultDatabaseSpec(ITestOutputHelper output, RedisClusterFix
 
         protected override bool SupportsRejectingNonSerializableObjects { get; } = false;
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
-            base.Dispose(disposing);
+            base.AfterAll();
             DbUtils.Clean();
         }
 

diff --git a/src/Akka.Persistence.Redis.Cluster.Tests/RedisJournalPerfSpec.cs b/src/Akka.Persistence.Redis.Cluster.Tests/RedisJournalPerfSpec.cs
@@ -36,9 +36,9 @@ public RedisJournalPerfSpec(ITestOutputHelper output, RedisClusterFixture fixtur
         {
         }
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
-            base.Dispose(disposing);
+            base.AfterAll();
             DbUtils.Clean();
         }
     }

diff --git a/src/Akka.Persistence.Redis.Cluster.Tests/RedisJournalSpec.cs b/src/Akka.Persistence.Redis.Cluster.Tests/RedisJournalSpec.cs
@@ -49,9 +49,9 @@ public RedisJournalSpec(ITestOutputHelper output, RedisClusterFixture fixture)
 
         protected override bool SupportsRejectingNonSerializableObjects { get; } = false;
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
-            base.Dispose(disposing);
+            base.AfterAll();
             DbUtils.Clean();
         }
 

diff --git a/src/Akka.Persistence.Redis.Cluster.Tests/RedisSnapshotStoreDefaultDatabaseSpec.cs b/src/Akka.Persistence.Redis.Cluster.Tests/RedisSnapshotStoreDefaultDatabaseSpec.cs
@@ -52,9 +52,9 @@ public RedisSnapshotStoreDefaultDatabaseSpec(ITestOutputHelper output, RedisClus
             Initialize();
         }
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
-            base.Dispose(disposing);
+            base.AfterAll();
             DbUtils.Clean();
         }
     }

diff --git a/src/Akka.Persistence.Redis.Cluster.Tests/RedisSnapshotStoreSpec.cs b/src/Akka.Persistence.Redis.Cluster.Tests/RedisSnapshotStoreSpec.cs
@@ -51,9 +51,9 @@ public RedisSnapshotStoreSpec(ITestOutputHelper output, RedisClusterFixture fixt
             Initialize();
         }
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
-            base.Dispose(disposing);
+            base.AfterAll();
             DbUtils.Clean();
         }
     }

diff --git a/src/Akka.Persistence.Redis.Cluster.Tests/Serialization/RedisJournalSerializationSpec.cs b/src/Akka.Persistence.Redis.Cluster.Tests/Serialization/RedisJournalSerializationSpec.cs
@@ -46,9 +46,9 @@ public override void Journal_should_serialize_Persistent_with_EventAdapter_manif
         {
         }
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
-            base.Dispose(disposing);
+            base.AfterAll();
             DbUtils.Clean();
         }
 

diff --git a/...Akka.Persistence.Redis.Cluster.Tests/Serialization/RedisSnapshotStoreSerializationSpec.cs b/...Akka.Persistence.Redis.Cluster.Tests/Serialization/RedisSnapshotStoreSerializationSpec.cs
@@ -46,9 +46,9 @@ public RedisSnapshotStoreSerializationSpec(ITestOutputHelper output, RedisCluste
         {
         }
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
-            base.Dispose(disposing);
+            base.AfterAll();
             DbUtils.Clean();
         }
     }

diff --git a/src/Akka.Persistence.Redis.Tests/Query/RedisCurrentEventsByPersistenceIdSpec.cs b/src/Akka.Persistence.Redis.Tests/Query/RedisCurrentEventsByPersistenceIdSpec.cs
@@ -44,10 +44,10 @@ public RedisCurrentEventsByPersistenceIdSpec(ITestOutputHelper output, RedisFixt
             ReadJournal = Sys.ReadJournalFor<RedisReadJournal>(RedisReadJournal.Identifier);
         }
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
             DbUtils.Clean(Database);
-            base.Dispose(disposing);
+            base.AfterAll();
         }
     }
 }
diff --git a/src/Akka.Persistence.Redis.Tests/Query/RedisEventsByPersistenceIdSpec.cs b/src/Akka.Persistence.Redis.Tests/Query/RedisEventsByPersistenceIdSpec.cs
@@ -40,10 +40,10 @@ public RedisEventsByPersistenceIdSpec(ITestOutputHelper output, RedisFixture fix
             ReadJournal = Sys.ReadJournalFor<RedisReadJournal>(RedisReadJournal.Identifier);
         }
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
             DbUtils.Clean(Database);
-            base.Dispose(disposing);
+            base.AfterAll();
         }
     }
 }
diff --git a/src/Akka.Persistence.Redis.Tests/RedisJournalDefaultDatabaseSpec.cs b/src/Akka.Persistence.Redis.Tests/RedisJournalDefaultDatabaseSpec.cs
@@ -43,9 +43,9 @@ public RedisJournalDefaultDatabaseSpec(ITestOutputHelper output, RedisFixture fi
 
         protected override bool SupportsRejectingNonSerializableObjects { get; } = false;
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
-            base.Dispose(disposing);
+            base.AfterAll();
             DbUtils.Clean(Database);
         }
     }

diff --git a/src/Akka.Persistence.Redis.Tests/RedisJournalPerfSpec.cs b/src/Akka.Persistence.Redis.Tests/RedisJournalPerfSpec.cs
@@ -40,9 +40,9 @@ public RedisJournalPerfSpec(ITestOutputHelper output, RedisFixture fixture) : ba
         {
         }
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
-            base.Dispose(disposing);
+            base.AfterAll();
             DbUtils.Clean(Database);
         }
     }

diff --git a/src/Akka.Persistence.Redis.Tests/RedisJournalSpec.cs b/src/Akka.Persistence.Redis.Tests/RedisJournalSpec.cs
@@ -42,9 +42,9 @@ public RedisJournalSpec(ITestOutputHelper output, RedisFixture fixture) : base(C
 
         protected override bool SupportsRejectingNonSerializableObjects { get; } = false;
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
-            base.Dispose(disposing);
+            base.AfterAll();
             DbUtils.Clean(Database);
         }
     }

diff --git a/src/Akka.Persistence.Redis.Tests/RedisSnapshotStoreDefaultDatabaseSpec.cs b/src/Akka.Persistence.Redis.Tests/RedisSnapshotStoreDefaultDatabaseSpec.cs
@@ -55,9 +55,9 @@ public RedisSnapshotStoreDefaultDatabaseSpec(ITestOutputHelper output, RedisFixt
             Initialize();
         }
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
-            base.Dispose(disposing);
+            base.AfterAll();
             DbUtils.Clean(Database);
         }
     }

diff --git a/src/Akka.Persistence.Redis.Tests/RedisSnapshotStoreSpec.cs b/src/Akka.Persistence.Redis.Tests/RedisSnapshotStoreSpec.cs
@@ -54,9 +54,9 @@ public RedisSnapshotStoreSpec(ITestOutputHelper output, RedisFixture fixture)
             Initialize();
         }
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
-            base.Dispose(disposing);
+            base.AfterAll();
             DbUtils.Clean(Database);
         }
     }

diff --git a/src/Akka.Persistence.Redis.Tests/Serialization/RedisJournalSerializationSpec.cs b/src/Akka.Persistence.Redis.Tests/Serialization/RedisJournalSerializationSpec.cs
@@ -49,9 +49,9 @@ public override void Journal_should_serialize_Persistent_with_EventAdapter_manif
         {
         }
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
-            base.Dispose(disposing);
+            base.AfterAll();
             DbUtils.Clean(Database);
         }
 

diff --git a/src/Akka.Persistence.Redis.Tests/Serialization/RedisSnapshotStoreSerializationSpec.cs b/src/Akka.Persistence.Redis.Tests/Serialization/RedisSnapshotStoreSerializationSpec.cs
@@ -49,9 +49,9 @@ public RedisSnapshotStoreSerializationSpec(ITestOutputHelper output, RedisFixtur
         {
         }
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
-            base.Dispose(disposing);
+            base.AfterAll();
             DbUtils.Clean(Database);
         }
     }

diff --git a/src/Akka.Persistence.Redis/Query/EventsByPersistenceIdPublisher.cs b/src/Akka.Persistence.Redis/Query/EventsByPersistenceIdPublisher.cs
@@ -68,11 +68,18 @@ protected override bool Receive(object message)
 
         protected bool Init(object message)
         {
-            return message.Match()
-                .With<EventsByPersistenceIdPublisher.Continue>(() => { })
-                .With<Request>(_ => ReceiveInitialRequest())
-                .With<Cancel>(_ => Context.Stop(Self))
-                .WasHandled;
+            switch (message)
+            {
+                case EventsByPersistenceIdPublisher.Continue _:                   
+                    return true;
+                case Request _:
+                    ReceiveInitialRequest();
+                    return true;
+                case Cancel _:
+                    Context.Stop(Self);
+                    return true;
+            }
+            return false;
         }
 
         protected bool Idle(object message)

diff --git a/src/benchmarks/Akka.Persistence.Redis.Benchmark.DockerTests/Docker/RedisJournalBenchmarks.cs b/src/benchmarks/Akka.Persistence.Redis.Benchmark.DockerTests/Docker/RedisJournalBenchmarks.cs
@@ -54,9 +54,9 @@ public void PersistenceActor_Must_measure_PersistGroup1000()
             RunGroupBenchmark(1000, 10);
         }
 
-        protected override void Dispose(bool disposing)
+        protected override void AfterAll()
         {
-            base.Dispose(disposing);
+            base.AfterAll();
             DbUtils.Clean(Database);
         }
     }

diff --git a/src/common.props b/src/common.props
@@ -44,8 +44,8 @@ Other Changes**
   </PropertyGroup>
   <PropertyGroup>
     <XunitVersion>2.4.2</XunitVersion>
-    <TestSdkVersion>17.4.0</TestSdkVersion>
-    <AkkaVersion>1.4.49</AkkaVersion>
+    <TestSdkVersion>17.5.0</TestSdkVersion>
+    <AkkaVersion>1.5.0-beta6</AkkaVersion>
     <RedisVersion>2.6.86</RedisVersion>
     <DockerVersion>3.125.12</DockerVersion>
     <NetCoreTestVersion>netcoreapp3.1</NetCoreTestVersion>