Skip to content

Commit ad69cfd

Browse files
Remove Akka.Persistence.Sql.Common and Akka.Persistence.Query.Sql (#7551)
* Remove Akka.Persistence.Sql.Common and Akka.Persistence.Query.Sql Deprecated and no longer maintained - part of #7252 close #7550 * Fix missing DocFX reference to akka.persistence.query.sql * Fix unit tests --------- Co-authored-by: Gregorius Soedharmo <[email protected]>
1 parent 4cd5dca commit ad69cfd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+24
-192
lines changed

docs/articles/persistence/persistence-query.md

Lines changed: 1 addition & 5 deletions

src/Akka.sln

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Persistence.Query.Test
126126
EndProject
127127
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Streams.Tests.Performance", "core\Akka.Streams.Tests.Performance\Akka.Streams.Tests.Performance.csproj", "{F5934093-4B7C-4303-9E27-60B4021C05B2}"
128128
EndProject
129-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Persistence.Query.Sql", "contrib\persistence\Akka.Persistence.Query.Sql\Akka.Persistence.Query.Sql.csproj", "{3CBD3880-0655-44CC-AD81-77E8CADFCC3E}"
130-
EndProject
131129
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Cluster.Tools.Tests.MultiNode", "contrib\cluster\Akka.Cluster.Tools.Tests.MultiNode\Akka.Cluster.Tools.Tests.MultiNode.csproj", "{666698AB-85BC-4C91-894C-CBB4316DC1A4}"
132130
EndProject
133-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Persistence.Sql.TestKit", "contrib\persistence\Akka.Persistence.Sql.TestKit\Akka.Persistence.Sql.TestKit.csproj", "{14502A16-2B6F-4728-8A98-ED5AF45FC515}"
134-
EndProject
135131
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Streams.Tests.TCK", "core\Akka.Streams.Tests.TCK\Akka.Streams.Tests.TCK.csproj", "{805908F6-8792-47C0-8E4F-4DB4C5736A47}"
136132
EndProject
137133
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Cluster.Sharding.Tests.MultiNode", "contrib\cluster\Akka.Cluster.Sharding.Tests.MultiNode\Akka.Cluster.Sharding.Tests.MultiNode.csproj", "{F79A5E87-1DB5-4D76-9B14-382F8C536DA6}"
@@ -605,14 +601,6 @@ Global
605601
{F5934093-4B7C-4303-9E27-60B4021C05B2}.Release|Any CPU.Build.0 = Release|Any CPU
606602
{F5934093-4B7C-4303-9E27-60B4021C05B2}.Release|x64.ActiveCfg = Release|Any CPU
607603
{F5934093-4B7C-4303-9E27-60B4021C05B2}.Release|x86.ActiveCfg = Release|Any CPU
608-
{3CBD3880-0655-44CC-AD81-77E8CADFCC3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
609-
{3CBD3880-0655-44CC-AD81-77E8CADFCC3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
610-
{3CBD3880-0655-44CC-AD81-77E8CADFCC3E}.Debug|x64.ActiveCfg = Debug|Any CPU
611-
{3CBD3880-0655-44CC-AD81-77E8CADFCC3E}.Debug|x86.ActiveCfg = Debug|Any CPU
612-
{3CBD3880-0655-44CC-AD81-77E8CADFCC3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
613-
{3CBD3880-0655-44CC-AD81-77E8CADFCC3E}.Release|Any CPU.Build.0 = Release|Any CPU
614-
{3CBD3880-0655-44CC-AD81-77E8CADFCC3E}.Release|x64.ActiveCfg = Release|Any CPU
615-
{3CBD3880-0655-44CC-AD81-77E8CADFCC3E}.Release|x86.ActiveCfg = Release|Any CPU
616604
{666698AB-85BC-4C91-894C-CBB4316DC1A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
617605
{666698AB-85BC-4C91-894C-CBB4316DC1A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
618606
{666698AB-85BC-4C91-894C-CBB4316DC1A4}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -621,14 +609,6 @@ Global
621609
{666698AB-85BC-4C91-894C-CBB4316DC1A4}.Release|Any CPU.Build.0 = Release|Any CPU
622610
{666698AB-85BC-4C91-894C-CBB4316DC1A4}.Release|x64.ActiveCfg = Release|Any CPU
623611
{666698AB-85BC-4C91-894C-CBB4316DC1A4}.Release|x86.ActiveCfg = Release|Any CPU
624-
{14502A16-2B6F-4728-8A98-ED5AF45FC515}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
625-
{14502A16-2B6F-4728-8A98-ED5AF45FC515}.Debug|Any CPU.Build.0 = Debug|Any CPU
626-
{14502A16-2B6F-4728-8A98-ED5AF45FC515}.Debug|x64.ActiveCfg = Debug|Any CPU
627-
{14502A16-2B6F-4728-8A98-ED5AF45FC515}.Debug|x86.ActiveCfg = Debug|Any CPU
628-
{14502A16-2B6F-4728-8A98-ED5AF45FC515}.Release|Any CPU.ActiveCfg = Release|Any CPU
629-
{14502A16-2B6F-4728-8A98-ED5AF45FC515}.Release|Any CPU.Build.0 = Release|Any CPU
630-
{14502A16-2B6F-4728-8A98-ED5AF45FC515}.Release|x64.ActiveCfg = Release|Any CPU
631-
{14502A16-2B6F-4728-8A98-ED5AF45FC515}.Release|x86.ActiveCfg = Release|Any CPU
632612
{805908F6-8792-47C0-8E4F-4DB4C5736A47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
633613
{805908F6-8792-47C0-8E4F-4DB4C5736A47}.Debug|Any CPU.Build.0 = Debug|Any CPU
634614
{805908F6-8792-47C0-8E4F-4DB4C5736A47}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1404,9 +1384,7 @@ Global
14041384
{92AB2788-E008-40D0-8B54-0C95B3CF3404} = {01167D3C-49C4-4CDE-9787-C176D139ACDD}
14051385
{C01FE575-10B5-4072-8EF9-66FA7CD86F6F} = {01167D3C-49C4-4CDE-9787-C176D139ACDD}
14061386
{F5934093-4B7C-4303-9E27-60B4021C05B2} = {01167D3C-49C4-4CDE-9787-C176D139ACDD}
1407-
{3CBD3880-0655-44CC-AD81-77E8CADFCC3E} = {264C22A4-CAFC-41F6-B82C-4DDC5C196767}
14081387
{666698AB-85BC-4C91-894C-CBB4316DC1A4} = {76F58DC4-19F1-43EF-A6E2-EC1CC8395AC5}
1409-
{14502A16-2B6F-4728-8A98-ED5AF45FC515} = {264C22A4-CAFC-41F6-B82C-4DDC5C196767}
14101388
{805908F6-8792-47C0-8E4F-4DB4C5736A47} = {01167D3C-49C4-4CDE-9787-C176D139ACDD}
14111389
{F79A5E87-1DB5-4D76-9B14-382F8C536DA6} = {76F58DC4-19F1-43EF-A6E2-EC1CC8395AC5}
14121390
{59CFFC88-8A73-445D-B191-281E40BE9421} = {76F58DC4-19F1-43EF-A6E2-EC1CC8395AC5}

src/contrib/persistence/Akka.Persistence.Query.Sql/Akka.Persistence.Query.Sql.csproj

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/contrib/persistence/Akka.Persistence.Query.Sql/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/contrib/persistence/Akka.Persistence.Sql.Common/Akka.Persistence.Sql.Common.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,9 @@
2121
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
2222
</ItemGroup>
2323

24+
<ItemGroup>
25+
<Folder Include="Journal\" />
26+
<Folder Include="Snapshot\" />
27+
</ItemGroup>
28+
2429
</Project>

src/contrib/persistence/Akka.Persistence.Sql.TestKit/Akka.Persistence.Sql.TestKit.csproj

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/contrib/persistence/Akka.Persistence.Sql.TestKit/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Akka.Persistence.Sqlite.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10+
<ProjectReference Include="..\..\..\core\Akka.Persistence.TCK\Akka.Persistence.TCK.csproj" />
1011
<ProjectReference Include="..\..\..\core\Akka.Streams\Akka.Streams.csproj" />
12+
<ProjectReference Include="..\..\..\core\Akka.Tests.Shared.Internals\Akka.Tests.Shared.Internals.csproj" />
1113
<ProjectReference Include="..\Akka.Persistence.Sqlite\Akka.Persistence.Sqlite.csproj" />
12-
<ProjectReference Include="..\Akka.Persistence.Query.Sql\Akka.Persistence.Query.Sql.csproj" />
1314
<ProjectReference Include="..\Akka.Persistence.Sql.Common\Akka.Persistence.Sql.Common.csproj" />
14-
<ProjectReference Include="..\Akka.Persistence.Sql.TestKit\Akka.Persistence.Sql.TestKit.csproj" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

src/contrib/persistence/Akka.Persistence.Sqlite.Tests/AssemblyVersioning/BackwardsCompatSqliteJournalSpec.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55
// </copyright>
66
//-----------------------------------------------------------------------
77

8-
using System.Collections.Generic;
98
using Akka.Actor;
109
using Akka.Configuration;
11-
using Akka.Persistence.TCK.Journal;
12-
using Akka.Util.Internal;
1310
using Xunit;
1411
using Xunit.Abstractions;
1512

src/contrib/persistence/Akka.Persistence.Sql.TestKit/DefaultConfigSpec.cs renamed to src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Infrastructure/DefaultConfigSpec.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void SqlReadJournal_applies_default_config()
2828
var config = Sys.Settings.Config.GetConfig("akka.persistence.query.journal.sql");
2929

3030
config.IsNullOrEmpty().Should().BeFalse();
31-
config.GetString("class", null).Should().Be("Akka.Persistence.Query.Sql.SqlReadJournalProvider, Akka.Persistence.Query.Sql");
31+
config.GetString("class", null).Should().Be("Akka.Persistence.Query.Sql.SqlReadJournalProvider, Akka.Persistence.Sqlite");
3232
config.GetTimeSpan("refresh-interval", TimeSpan.MinValue).Should().Be(TimeSpan.FromSeconds(3));
3333
config.GetInt("max-buffer-size", 0).Should().Be(100);
3434
}

0 commit comments

Comments
 (0)