diff --git a/Masa.Framework.sln b/Masa.Framework.sln index 67e7052c8..ac93e39bb 100644 --- a/Masa.Framework.sln +++ b/Masa.Framework.sln @@ -39,7 +39,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dispatcher", "Dispatcher", EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Isolation", "Isolation", "{2D179841-A866-4ED4-8B42-97CCE4D6496D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReadWriteSpliting", "ReadWriteSpliting", "{FB0F5EB7-AA72-4D54-BD8D-43B173E54E19}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReadWriteSplitting", "ReadWriteSplitting", "{FB0F5EB7-AA72-4D54-BD8D-43B173E54E19}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SearchEngine", "SearchEngine", "{1EE02441-263C-458E-A774-9D522BFFBB3F}" EndProject @@ -99,9 +99,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.BuildingBlocks.Dispatc EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.BuildingBlocks.Isolation", "src\BuildingBlocks\Isolation\Masa.BuildingBlocks.Isolation\Masa.BuildingBlocks.Isolation.csproj", "{6586614A-39D8-412E-814C-3314F8A7909A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.BuildingBlocks.ReadWriteSpliting.Cqrs", "src\BuildingBlocks\ReadWriteSpliting\Masa.BuildingBlocks.ReadWriteSpliting.Cqrs\Masa.BuildingBlocks.ReadWriteSpliting.Cqrs.csproj", "{400854AA-AE3F-40EC-B5BF-C9F1257490AA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.BuildingBlocks.ReadWriteSpliting.EventSourcing", "src\BuildingBlocks\ReadWriteSpliting\Masa.BuildingBlocks.ReadWriteSpliting.EventSourcing\Masa.BuildingBlocks.ReadWriteSpliting.EventSourcing.csproj", "{0EDBF814-BBF1-48EB-8AFE-F70D75E7DC1E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.BuildingBlocks.ReadWriteSplitting.Cqrs", "src\BuildingBlocks\ReadWriteSplitting\Masa.BuildingBlocks.ReadWriteSplitting.Cqrs\Masa.BuildingBlocks.ReadWriteSplitting.Cqrs.csproj", "{400854AA-AE3F-40EC-B5BF-C9F1257490AA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Auth", "Auth", "{8A89304F-709C-4A3A-9FA6-D88761B8231B}" EndProject @@ -223,7 +221,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dispatcher", "Dispatcher", EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Isolation", "Isolation", "{0DA3779A-E0E9-46A3-BA6F-BCD5819DB6F9}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReadWriteSpliting", "ReadWriteSpliting", "{FD6300FB-5601-4516-BF1C-936690ECE026}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReadWriteSplitting", "ReadWriteSplitting", "{FD6300FB-5601-4516-BF1C-936690ECE026}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SearchEngine", "SearchEngine", "{830DDDD7-74A5-431B-92E4-C9641D0A10E4}" EndProject @@ -417,11 +415,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Isolation.Mult EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Isolation.Tests", "src\Contrib\Isolation\Tests\Masa.Contrib.Isolation.Tests\Masa.Contrib.Isolation.Tests.csproj", "{1C11B49B-4547-4035-A9F4-7D9AB9A07431}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.ReadWriteSpliting.Cqrs", "src\Contrib\ReadWriteSpliting\Masa.Contrib.ReadWriteSpliting.Cqrs\Masa.Contrib.ReadWriteSpliting.Cqrs.csproj", "{AF82713E-4B6C-4712-9865-06C13FF636FC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.ReadWriteSplitting.Cqrs", "src\Contrib\ReadWriteSplitting\Masa.Contrib.ReadWriteSplitting.Cqrs\Masa.Contrib.ReadWriteSplitting.Cqrs.csproj", "{AF82713E-4B6C-4712-9865-06C13FF636FC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{A1AB81FB-0FAA-4BCA-8903-F1268EEEB986}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.ReadWriteSpliting.Cqrs.Tests", "src\Contrib\ReadWriteSpliting\Tests\Masa.Contrib.ReadWriteSpliting.Cqrs.Tests\Masa.Contrib.ReadWriteSpliting.Cqrs.Tests.csproj", "{AE5E710D-705C-49F4-90D6-6C3C0D2C62A8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.ReadWriteSplitting.Cqrs.Tests", "src\Contrib\ReadWriteSplitting\Tests\Masa.Contrib.ReadWriteSplitting.Cqrs.Tests\Masa.Contrib.ReadWriteSplitting.Cqrs.Tests.csproj", "{AE5E710D-705C-49F4-90D6-6C3C0D2C62A8}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch", "src\Contrib\SearchEngine\AutoComplete\Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch\Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch.csproj", "{984CFF2A-C321-43D5-A06C-5D053C0F97A9}" EndProject @@ -523,19 +521,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.IdGenerat EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Framework.IntegrationTests.EventBus", "test\Masa.Framework.IntegrationTests.EventBus\Masa.Framework.IntegrationTests.EventBus.csproj", "{A9EED08B-6C1E-4409-9874-AA7D34102519}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Data.IdGenerator.NormalGuid.Tests", "src\Contrib\Data\IdGenerator\NormalGuid\Masa.Contrib.Data.IdGenerator.NormalGuid.Tests\Masa.Contrib.Data.IdGenerator.NormalGuid.Tests.csproj", "{C488CAC3-6F06-4D29-B449-93CEF482C4D7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.IdGenerator.NormalGuid.Tests", "src\Contrib\Data\IdGenerator\NormalGuid\Masa.Contrib.Data.IdGenerator.NormalGuid.Tests\Masa.Contrib.Data.IdGenerator.NormalGuid.Tests.csproj", "{C488CAC3-6F06-4D29-B449-93CEF482C4D7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Serialization", "Serialization", "{F2595DAE-AEB7-4739-8578-B6635FC7C6FB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Data.Serialization.Json", "src\Contrib\Data\Serialization\Masa.Contrib.Data.Serialization.Json\Masa.Contrib.Data.Serialization.Json.csproj", "{E14E5712-EEC4-4249-84A5-5AC930E51E28}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.Serialization.Json", "src\Contrib\Data\Serialization\Masa.Contrib.Data.Serialization.Json\Masa.Contrib.Data.Serialization.Json.csproj", "{E14E5712-EEC4-4249-84A5-5AC930E51E28}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Data.Serialization.Yaml", "src\Contrib\Data\Serialization\Masa.Contrib.Data.Serialization.Yaml\Masa.Contrib.Data.Serialization.Yaml.csproj", "{7E8785A6-1B4D-4A35-9DA1-F6B99FF8C740}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.Serialization.Yaml", "src\Contrib\Data\Serialization\Masa.Contrib.Data.Serialization.Yaml\Masa.Contrib.Data.Serialization.Yaml.csproj", "{7E8785A6-1B4D-4A35-9DA1-F6B99FF8C740}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{6E93CADC-B6C7-4063-BEA7-56068D682C31}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Data.Serialization.Json.Tests", "src\Contrib\Data\Serialization\Tests\Masa.Contrib.Data.Serialization.Json.Tests\Masa.Contrib.Data.Serialization.Json.Tests.csproj", "{C55B75D2-43E0-4D3D-B705-110C4255528A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.Serialization.Json.Tests", "src\Contrib\Data\Serialization\Tests\Masa.Contrib.Data.Serialization.Json.Tests\Masa.Contrib.Data.Serialization.Json.Tests.csproj", "{C55B75D2-43E0-4D3D-B705-110C4255528A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.Serialization.Yaml.Tests", "src\Contrib\Data\Serialization\Tests\Masa.Contrib.Data.Serialization.Yaml.Tests\Masa.Contrib.Data.Serialization.Yaml.Tests.csproj", "{A86DA6FB-58E0-4FEE-B663-C336F9B3A3A5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Data.Serialization.Yaml.Tests", "src\Contrib\Data\Serialization\Tests\Masa.Contrib.Data.Serialization.Yaml.Tests\Masa.Contrib.Data.Serialization.Yaml.Tests.csproj", "{A86DA6FB-58E0-4FEE-B663-C336F9B3A3A5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.BuildingBlocks.ReadWriteSpliting.EventSourcing", "src\BuildingBlocks\ReadWriteSplitting\Masa.BuildingBlocks.ReadWriteSplitting.EventSourcing\Masa.BuildingBlocks.ReadWriteSpliting.EventSourcing.csproj", "{4FF4632A-4E93-40BF-8D01-843548560F76}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -729,14 +729,6 @@ Global {400854AA-AE3F-40EC-B5BF-C9F1257490AA}.Release|Any CPU.Build.0 = Release|Any CPU {400854AA-AE3F-40EC-B5BF-C9F1257490AA}.Release|x64.ActiveCfg = Release|Any CPU {400854AA-AE3F-40EC-B5BF-C9F1257490AA}.Release|x64.Build.0 = Release|Any CPU - {0EDBF814-BBF1-48EB-8AFE-F70D75E7DC1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EDBF814-BBF1-48EB-8AFE-F70D75E7DC1E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EDBF814-BBF1-48EB-8AFE-F70D75E7DC1E}.Debug|x64.ActiveCfg = Debug|Any CPU - {0EDBF814-BBF1-48EB-8AFE-F70D75E7DC1E}.Debug|x64.Build.0 = Debug|Any CPU - {0EDBF814-BBF1-48EB-8AFE-F70D75E7DC1E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EDBF814-BBF1-48EB-8AFE-F70D75E7DC1E}.Release|Any CPU.Build.0 = Release|Any CPU - {0EDBF814-BBF1-48EB-8AFE-F70D75E7DC1E}.Release|x64.ActiveCfg = Release|Any CPU - {0EDBF814-BBF1-48EB-8AFE-F70D75E7DC1E}.Release|x64.Build.0 = Release|Any CPU {C37FB18D-FBA1-49DF-96CD-24D6F65B66E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C37FB18D-FBA1-49DF-96CD-24D6F65B66E1}.Debug|Any CPU.Build.0 = Debug|Any CPU {C37FB18D-FBA1-49DF-96CD-24D6F65B66E1}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -1897,6 +1889,14 @@ Global {A86DA6FB-58E0-4FEE-B663-C336F9B3A3A5}.Release|Any CPU.Build.0 = Release|Any CPU {A86DA6FB-58E0-4FEE-B663-C336F9B3A3A5}.Release|x64.ActiveCfg = Release|Any CPU {A86DA6FB-58E0-4FEE-B663-C336F9B3A3A5}.Release|x64.Build.0 = Release|Any CPU + {4FF4632A-4E93-40BF-8D01-843548560F76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4FF4632A-4E93-40BF-8D01-843548560F76}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4FF4632A-4E93-40BF-8D01-843548560F76}.Debug|x64.ActiveCfg = Debug|Any CPU + {4FF4632A-4E93-40BF-8D01-843548560F76}.Debug|x64.Build.0 = Debug|Any CPU + {4FF4632A-4E93-40BF-8D01-843548560F76}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4FF4632A-4E93-40BF-8D01-843548560F76}.Release|Any CPU.Build.0 = Release|Any CPU + {4FF4632A-4E93-40BF-8D01-843548560F76}.Release|x64.ActiveCfg = Release|Any CPU + {4FF4632A-4E93-40BF-8D01-843548560F76}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1943,7 +1943,6 @@ Global {D2009F94-EA9C-44F0-B210-C373F9FE3641} = {8A17DE9A-258E-49E1-9EB2-B8B3F374A470} {6586614A-39D8-412E-814C-3314F8A7909A} = {2D179841-A866-4ED4-8B42-97CCE4D6496D} {400854AA-AE3F-40EC-B5BF-C9F1257490AA} = {FB0F5EB7-AA72-4D54-BD8D-43B173E54E19} - {0EDBF814-BBF1-48EB-8AFE-F70D75E7DC1E} = {FB0F5EB7-AA72-4D54-BD8D-43B173E54E19} {8A89304F-709C-4A3A-9FA6-D88761B8231B} = {8A9DBB76-6618-4982-87D7-6CBD8375EB15} {C37FB18D-FBA1-49DF-96CD-24D6F65B66E1} = {8A89304F-709C-4A3A-9FA6-D88761B8231B} {C6006F72-B9F9-4E57-B2A9-63B2D0EA5EF0} = {8A89304F-709C-4A3A-9FA6-D88761B8231B} @@ -2161,6 +2160,7 @@ Global {6E93CADC-B6C7-4063-BEA7-56068D682C31} = {F2595DAE-AEB7-4739-8578-B6635FC7C6FB} {C55B75D2-43E0-4D3D-B705-110C4255528A} = {6E93CADC-B6C7-4063-BEA7-56068D682C31} {A86DA6FB-58E0-4FEE-B663-C336F9B3A3A5} = {6E93CADC-B6C7-4063-BEA7-56068D682C31} + {4FF4632A-4E93-40BF-8D01-843548560F76} = {FB0F5EB7-AA72-4D54-BD8D-43B173E54E19} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {40383055-CC50-4600-AD9A-53C14F620D03} diff --git a/README.md b/README.md index 68d533e7c..4a28955aa 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Provide open, community driven reusable components for building modern applicati * [Configuration core, provide local configuration](./src/Configuration/Masa.Contrib.Configuration/README.md) * ConfigurationAPI * [Dcc](./src/Configuration/Masa.Contrib.Configuration.ConfigurationApi.Dcc/README.md) -* [CQRS](./src/ReadWriteSpliting/Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs/README.md) +* [CQRS](./src/ReadWriteSplitting/Cqrs/Masa.Contrib.ReadWriteSplitting.Cqrs/README.md) * Data: * [EntityFrameworkCore](./src/Data/Masa.Contrib.Data.EFCore/README.md) * [SqlServer](./src/Data/Masa.Contrib.Data.EFCore.SqlServer/README.md) diff --git a/README.zh-CN.md b/README.zh-CN.md index 706b8d60c..a0f54f7eb 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -21,7 +21,7 @@ MASA.Contrib是基于[MASA.BuildingBlocks](https://github.com/masastack/MASA.Bui * [Configuration核心、提供本地配置](./src/Configuration/Masa.Contrib.Configuration/README.zh-CN.md) * ConfigurationAPI * [Dcc](./src/Configuration/Masa.Contrib.Configuration.ConfigurationApi.Dcc/README.zh-CN.md) -* [CQRS](./src/ReadWriteSpliting/Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs/README.zh-CN.md) +* [CQRS](./src/ReadWriteSplitting/Cqrs/Masa.Contrib.ReadWriteSplitting.Cqrs/README.zh-CN.md) * Data: * [EntityFrameworkCore](./src/Data/Masa.Contrib.Data.EFCore/README.zh-CN.md) * [SqlServer](./src/Data/Masa.Contrib.Data.EFCore.SqlServer/README.zh-CN.md) diff --git a/src/BuildingBlocks/Ddd/Domain/Masa.BuildingBlocks.Ddd.Domain/Entities/Entity.cs b/src/BuildingBlocks/Ddd/Domain/Masa.BuildingBlocks.Ddd.Domain/Entities/Entity.cs index 125e7a35d..6cd4b61b2 100644 --- a/src/BuildingBlocks/Ddd/Domain/Masa.BuildingBlocks.Ddd.Domain/Entities/Entity.cs +++ b/src/BuildingBlocks/Ddd/Domain/Masa.BuildingBlocks.Ddd.Domain/Entities/Entity.cs @@ -3,7 +3,7 @@ namespace Masa.BuildingBlocks.Ddd.Domain.Entities; -public abstract class Entity : IEntity, IEquatable, IEquatable +public abstract class Entity : IEntity { public abstract IEnumerable<(string Name, object Value)> GetKeys(); @@ -22,24 +22,17 @@ public override bool Equals(object? obj) if (obj is Entity other) { - return other.GetKeys().Select(key => key.Value).SequenceEqual(GetKeys().Select(key => key.Value)); + return this == other; } - else - { - return false; - } - } - public bool Equals(Entity? other) - { - if (this is null ^ other is null) return false; - - return other!.GetKeys().Select(key => key.Value).SequenceEqual(GetKeys().Select(key => key.Value)); + return false; } + protected virtual bool Equals(Entity? other) => this == other; + public override int GetHashCode() { - return GetKeys().Select(key => key.Value).Aggregate(0, (hashCode, next) => HashCode.Combine(hashCode, next)); + return GetKeys().Select(key => key.Value).Aggregate(0, HashCode.Combine); } public static bool operator ==(Entity? x, Entity? y) @@ -48,7 +41,7 @@ public override int GetHashCode() if (x is null) return true; - return x.Equals(y); + return x.GetKeys().Select(key => key.Value).SequenceEqual(x.GetKeys().Select(key => key.Value)); } public static bool operator !=(Entity? x, Entity? y) diff --git a/src/BuildingBlocks/Ddd/Domain/Masa.BuildingBlocks.Ddd.Domain/Masa.BuildingBlocks.Ddd.Domain.csproj b/src/BuildingBlocks/Ddd/Domain/Masa.BuildingBlocks.Ddd.Domain/Masa.BuildingBlocks.Ddd.Domain.csproj index 541a26d5b..e5f18f173 100644 --- a/src/BuildingBlocks/Ddd/Domain/Masa.BuildingBlocks.Ddd.Domain/Masa.BuildingBlocks.Ddd.Domain.csproj +++ b/src/BuildingBlocks/Ddd/Domain/Masa.BuildingBlocks.Ddd.Domain/Masa.BuildingBlocks.Ddd.Domain.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/BuildingBlocks/Ddd/Domain/Masa.BuildingBlocks.Ddd.Domain/_Imports.cs b/src/BuildingBlocks/Ddd/Domain/Masa.BuildingBlocks.Ddd.Domain/_Imports.cs index ad09dad49..3a06596e0 100644 --- a/src/BuildingBlocks/Ddd/Domain/Masa.BuildingBlocks.Ddd.Domain/_Imports.cs +++ b/src/BuildingBlocks/Ddd/Domain/Masa.BuildingBlocks.Ddd.Domain/_Imports.cs @@ -8,8 +8,8 @@ global using Masa.BuildingBlocks.Ddd.Domain.Events; global using Masa.BuildingBlocks.Dispatcher.Events; global using Masa.BuildingBlocks.Dispatcher.IntegrationEvents; -global using Masa.BuildingBlocks.ReadWriteSpliting.Cqrs.Commands; -global using Masa.BuildingBlocks.ReadWriteSpliting.Cqrs.Queries; +global using Masa.BuildingBlocks.ReadWriteSplitting.Cqrs.Commands; +global using Masa.BuildingBlocks.ReadWriteSplitting.Cqrs.Queries; global using System.Linq.Expressions; global using System.Reflection; global using System.Text.Json.Serialization; diff --git a/src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Commands/Command.cs b/src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Commands/Command.cs similarity index 92% rename from src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Commands/Command.cs rename to src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Commands/Command.cs index 88ead4127..dbe91eaca 100644 --- a/src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Commands/Command.cs +++ b/src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Commands/Command.cs @@ -1,7 +1,7 @@ // Copyright (c) MASA Stack All rights reserved. // Licensed under the MIT License. See LICENSE.txt in the project root for license information. -namespace Masa.BuildingBlocks.ReadWriteSpliting.Cqrs.Commands; +namespace Masa.BuildingBlocks.ReadWriteSplitting.Cqrs.Commands; public abstract record Command : ICommand { diff --git a/src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Commands/ICommand.cs b/src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Commands/ICommand.cs similarity index 75% rename from src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Commands/ICommand.cs rename to src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Commands/ICommand.cs index b16f0ad3e..120896116 100644 --- a/src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Commands/ICommand.cs +++ b/src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Commands/ICommand.cs @@ -1,7 +1,7 @@ // Copyright (c) MASA Stack All rights reserved. // Licensed under the MIT License. See LICENSE.txt in the project root for license information. -namespace Masa.BuildingBlocks.ReadWriteSpliting.Cqrs.Commands; +namespace Masa.BuildingBlocks.ReadWriteSplitting.Cqrs.Commands; public interface ICommand : IEvent, ITransaction { diff --git a/src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Commands/ICommandHandler.cs b/src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Commands/ICommandHandler.cs similarity index 79% rename from src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Commands/ICommandHandler.cs rename to src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Commands/ICommandHandler.cs index 59d6070e5..b5ff5e876 100644 --- a/src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Commands/ICommandHandler.cs +++ b/src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Commands/ICommandHandler.cs @@ -1,7 +1,7 @@ // Copyright (c) MASA Stack All rights reserved. // Licensed under the MIT License. See LICENSE.txt in the project root for license information. -namespace Masa.BuildingBlocks.ReadWriteSpliting.Cqrs.Commands; +namespace Masa.BuildingBlocks.ReadWriteSplitting.Cqrs.Commands; public interface ICommandHandler : IEventHandler where TCommand : ICommand diff --git a/src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs.csproj b/src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs.csproj similarity index 100% rename from src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs.csproj rename to src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs.csproj diff --git a/src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Queries/IQuery.cs b/src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Queries/IQuery.cs similarity index 76% rename from src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Queries/IQuery.cs rename to src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Queries/IQuery.cs index b60550ebb..1a7a4a843 100644 --- a/src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Queries/IQuery.cs +++ b/src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Queries/IQuery.cs @@ -1,7 +1,7 @@ // Copyright (c) MASA Stack All rights reserved. // Licensed under the MIT License. See LICENSE.txt in the project root for license information. -namespace Masa.BuildingBlocks.ReadWriteSpliting.Cqrs.Queries; +namespace Masa.BuildingBlocks.ReadWriteSplitting.Cqrs.Queries; public interface IQuery : IEvent { diff --git a/src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Queries/IQueryHandler.cs b/src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Queries/IQueryHandler.cs similarity index 80% rename from src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Queries/IQueryHandler.cs rename to src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Queries/IQueryHandler.cs index c8a08f63b..b5053df8f 100644 --- a/src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Queries/IQueryHandler.cs +++ b/src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Queries/IQueryHandler.cs @@ -1,7 +1,7 @@ // Copyright (c) MASA Stack All rights reserved. // Licensed under the MIT License. See LICENSE.txt in the project root for license information. -namespace Masa.BuildingBlocks.ReadWriteSpliting.Cqrs.Queries; +namespace Masa.BuildingBlocks.ReadWriteSplitting.Cqrs.Queries; public interface IQueryHandler : IEventHandler where TCommand : IQuery diff --git a/src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Queries/Query.cs b/src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Queries/Query.cs similarity index 92% rename from src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Queries/Query.cs rename to src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Queries/Query.cs index fb5ca2e1b..da592726f 100644 --- a/src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/Queries/Query.cs +++ b/src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/Queries/Query.cs @@ -1,7 +1,7 @@ // Copyright (c) MASA Stack All rights reserved. // Licensed under the MIT License. See LICENSE.txt in the project root for license information. -namespace Masa.BuildingBlocks.ReadWriteSpliting.Cqrs.Queries; +namespace Masa.BuildingBlocks.ReadWriteSplitting.Cqrs.Queries; public abstract record Query : IQuery { diff --git a/src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/_Imports.cs b/src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/_Imports.cs similarity index 100% rename from src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.Cqrs/_Imports.cs rename to src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.Cqrs/_Imports.cs diff --git a/src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.EventSourcing/Masa.BuildingBlocks.ReadWriteSpliting.EventSourcing.csproj b/src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.EventSourcing/Masa.BuildingBlocks.ReadWriteSpliting.EventSourcing.csproj similarity index 100% rename from src/BuildingBlocks/ReadWriteSpliting/Masa.BuildingBlocks.ReadWriteSpliting.EventSourcing/Masa.BuildingBlocks.ReadWriteSpliting.EventSourcing.csproj rename to src/BuildingBlocks/ReadWriteSplitting/Masa.BuildingBlocks.ReadWriteSplitting.EventSourcing/Masa.BuildingBlocks.ReadWriteSpliting.EventSourcing.csproj diff --git a/src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/_Imports.cs b/src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/_Imports.cs deleted file mode 100644 index 1f87f0b77..000000000 --- a/src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/_Imports.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) MASA Stack All rights reserved. -// Licensed under the MIT License. See LICENSE.txt in the project root for license information. - -global using Masa.BuildingBlocks.Dispatcher.Events; -global using Masa.BuildingBlocks.ReadWriteSpliting.Cqrs.Commands; -global using Masa.BuildingBlocks.ReadWriteSpliting.Cqrs.Queries; -global using Masa.Contrib.Dispatcher.Events; -global using Masa.Contrib.ReadWriteSpliting.Cqrs.Commands; -global using Masa.Contrib.ReadWriteSpliting.Cqrs.Queries; -global using Masa.Contrib.ReadWriteSpliting.Cqrs.Tests.Commands; -global using Masa.Contrib.ReadWriteSpliting.Cqrs.Tests.Queries; -global using Microsoft.Extensions.DependencyInjection; -global using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/src/Contrib/ReadWriteSpliting/Masa.Contrib.ReadWriteSpliting.Cqrs/Commands/CommandHandler.cs b/src/Contrib/ReadWriteSplitting/Masa.Contrib.ReadWriteSplitting.Cqrs/Commands/CommandHandler.cs similarity index 88% rename from src/Contrib/ReadWriteSpliting/Masa.Contrib.ReadWriteSpliting.Cqrs/Commands/CommandHandler.cs rename to src/Contrib/ReadWriteSplitting/Masa.Contrib.ReadWriteSplitting.Cqrs/Commands/CommandHandler.cs index 46acfac6d..cd313cfd6 100644 --- a/src/Contrib/ReadWriteSpliting/Masa.Contrib.ReadWriteSpliting.Cqrs/Commands/CommandHandler.cs +++ b/src/Contrib/ReadWriteSplitting/Masa.Contrib.ReadWriteSplitting.Cqrs/Commands/CommandHandler.cs @@ -1,7 +1,7 @@ // Copyright (c) MASA Stack All rights reserved. // Licensed under the MIT License. See LICENSE.txt in the project root for license information. -namespace Masa.Contrib.ReadWriteSpliting.Cqrs.Commands; +namespace Masa.Contrib.ReadWriteSplitting.Cqrs.Commands; public abstract class CommandHandler : ICommandHandler, ISagaEventHandler where TCommand : ICommand diff --git a/src/Contrib/ReadWriteSpliting/Masa.Contrib.ReadWriteSpliting.Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs.csproj b/src/Contrib/ReadWriteSplitting/Masa.Contrib.ReadWriteSplitting.Cqrs/Masa.Contrib.ReadWriteSplitting.Cqrs.csproj similarity index 75% rename from src/Contrib/ReadWriteSpliting/Masa.Contrib.ReadWriteSpliting.Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs.csproj rename to src/Contrib/ReadWriteSplitting/Masa.Contrib.ReadWriteSplitting.Cqrs/Masa.Contrib.ReadWriteSplitting.Cqrs.csproj index 8c49b4e24..53ee64f72 100644 --- a/src/Contrib/ReadWriteSpliting/Masa.Contrib.ReadWriteSpliting.Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs.csproj +++ b/src/Contrib/ReadWriteSplitting/Masa.Contrib.ReadWriteSplitting.Cqrs/Masa.Contrib.ReadWriteSplitting.Cqrs.csproj @@ -4,6 +4,7 @@ net6.0 enable enable + Masa.Contrib.ReadWriteSplitting.Cqrs @@ -12,7 +13,7 @@ - + diff --git a/src/Contrib/ReadWriteSpliting/Masa.Contrib.ReadWriteSpliting.Cqrs/Queries/QueryHandler.cs b/src/Contrib/ReadWriteSplitting/Masa.Contrib.ReadWriteSplitting.Cqrs/Queries/QueryHandler.cs similarity index 85% rename from src/Contrib/ReadWriteSpliting/Masa.Contrib.ReadWriteSpliting.Cqrs/Queries/QueryHandler.cs rename to src/Contrib/ReadWriteSplitting/Masa.Contrib.ReadWriteSplitting.Cqrs/Queries/QueryHandler.cs index 697abced5..ab859c154 100644 --- a/src/Contrib/ReadWriteSpliting/Masa.Contrib.ReadWriteSpliting.Cqrs/Queries/QueryHandler.cs +++ b/src/Contrib/ReadWriteSplitting/Masa.Contrib.ReadWriteSplitting.Cqrs/Queries/QueryHandler.cs @@ -1,7 +1,7 @@ // Copyright (c) MASA Stack All rights reserved. // Licensed under the MIT License. See LICENSE.txt in the project root for license information. -namespace Masa.Contrib.ReadWriteSpliting.Cqrs.Queries; +namespace Masa.Contrib.ReadWriteSplitting.Cqrs.Queries; public abstract class QueryHandler : IQueryHandler where TQuery : IQuery diff --git a/src/Contrib/ReadWriteSpliting/Masa.Contrib.ReadWriteSpliting.Cqrs/README.md b/src/Contrib/ReadWriteSplitting/Masa.Contrib.ReadWriteSplitting.Cqrs/README.md similarity index 97% rename from src/Contrib/ReadWriteSpliting/Masa.Contrib.ReadWriteSpliting.Cqrs/README.md rename to src/Contrib/ReadWriteSplitting/Masa.Contrib.ReadWriteSplitting.Cqrs/README.md index 0fd550e09..0e9c97321 100644 --- a/src/Contrib/ReadWriteSpliting/Masa.Contrib.ReadWriteSpliting.Cqrs/README.md +++ b/src/Contrib/ReadWriteSplitting/Masa.Contrib.ReadWriteSplitting.Cqrs/README.md @@ -8,7 +8,7 @@ Example： 2. Support the Handler of Saga mode, and provide the basic implementation of CommandHandler ```C# - Install-Package Masa.Contrib.ReadWriteSpliting.Cqrs + Install-Package Masa.Contrib.ReadWriteSplitting.Cqrs ``` ##### Query： diff --git a/src/Contrib/ReadWriteSpliting/Masa.Contrib.ReadWriteSpliting.Cqrs/README.zh-CN.md b/src/Contrib/ReadWriteSplitting/Masa.Contrib.ReadWriteSplitting.Cqrs/README.zh-CN.md similarity index 97% rename from src/Contrib/ReadWriteSpliting/Masa.Contrib.ReadWriteSpliting.Cqrs/README.zh-CN.md rename to src/Contrib/ReadWriteSplitting/Masa.Contrib.ReadWriteSplitting.Cqrs/README.zh-CN.md index 0cf2b9384..b5d9864ba 100644 --- a/src/Contrib/ReadWriteSpliting/Masa.Contrib.ReadWriteSpliting.Cqrs/README.zh-CN.md +++ b/src/Contrib/ReadWriteSplitting/Masa.Contrib.ReadWriteSplitting.Cqrs/README.zh-CN.md @@ -8,7 +8,7 @@ 2. 支持Saga模式的Handler，并提供CommandHandler基础实现 ```C# - Install-Package Masa.Contrib.ReadWriteSpliting.Cqrs + Install-Package Masa.Contrib.ReadWriteSplitting.Cqrs ``` ##### Query： diff --git a/src/Contrib/ReadWriteSpliting/Masa.Contrib.ReadWriteSpliting.Cqrs/_Imports.cs b/src/Contrib/ReadWriteSplitting/Masa.Contrib.ReadWriteSplitting.Cqrs/_Imports.cs similarity index 60% rename from src/Contrib/ReadWriteSpliting/Masa.Contrib.ReadWriteSpliting.Cqrs/_Imports.cs rename to src/Contrib/ReadWriteSplitting/Masa.Contrib.ReadWriteSplitting.Cqrs/_Imports.cs index 9690a40df..e4e658729 100644 --- a/src/Contrib/ReadWriteSpliting/Masa.Contrib.ReadWriteSpliting.Cqrs/_Imports.cs +++ b/src/Contrib/ReadWriteSplitting/Masa.Contrib.ReadWriteSplitting.Cqrs/_Imports.cs @@ -2,5 +2,5 @@ // Licensed under the MIT License. See LICENSE.txt in the project root for license information. global using Masa.BuildingBlocks.Dispatcher.Events; -global using Masa.BuildingBlocks.ReadWriteSpliting.Cqrs.Commands; -global using Masa.BuildingBlocks.ReadWriteSpliting.Cqrs.Queries; +global using Masa.BuildingBlocks.ReadWriteSplitting.Cqrs.Commands; +global using Masa.BuildingBlocks.ReadWriteSplitting.Cqrs.Queries; diff --git a/src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/Commands/CreateProductionCommand.cs b/src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/Commands/CreateProductionCommand.cs similarity index 81% rename from src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/Commands/CreateProductionCommand.cs rename to src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/Commands/CreateProductionCommand.cs index 44ca45c3b..b64acf3f6 100644 --- a/src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/Commands/CreateProductionCommand.cs +++ b/src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/Commands/CreateProductionCommand.cs @@ -1,7 +1,7 @@ // Copyright (c) MASA Stack All rights reserved. // Licensed under the MIT License. See LICENSE.txt in the project root for license information. -namespace Masa.Contrib.ReadWriteSpliting.Cqrs.Tests.Commands; +namespace Masa.Contrib.ReadWriteSplitting.Cqrs.Tests.Commands; public record CreateProductionCommand : Command { diff --git a/src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/CqrsTest.cs b/src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/CqrsTest.cs similarity index 95% rename from src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/CqrsTest.cs rename to src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/CqrsTest.cs index cf3bb5c12..b1ad531d9 100644 --- a/src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/CqrsTest.cs +++ b/src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/CqrsTest.cs @@ -1,7 +1,7 @@ // Copyright (c) MASA Stack All rights reserved. // Licensed under the MIT License. See LICENSE.txt in the project root for license information. -namespace Masa.Contrib.ReadWriteSpliting.Cqrs.Tests; +namespace Masa.Contrib.ReadWriteSplitting.Cqrs.Tests; [TestClass] public class CQRSTest diff --git a/src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/CreateProductionCommandHandler.cs b/src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/CreateProductionCommandHandler.cs similarity index 94% rename from src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/CreateProductionCommandHandler.cs rename to src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/CreateProductionCommandHandler.cs index 675fc7ba2..711b5144d 100644 --- a/src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/CreateProductionCommandHandler.cs +++ b/src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/CreateProductionCommandHandler.cs @@ -1,7 +1,7 @@ // Copyright (c) MASA Stack All rights reserved. // Licensed under the MIT License. See LICENSE.txt in the project root for license information. -namespace Masa.Contrib.ReadWriteSpliting.Cqrs.Tests; +namespace Masa.Contrib.ReadWriteSplitting.Cqrs.Tests; public class CreateProductionCommandHandler : CommandHandler { diff --git a/src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests.csproj b/src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests.csproj similarity index 95% rename from src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests.csproj rename to src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests.csproj index b8598c80a..abbae157b 100644 --- a/src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests.csproj +++ b/src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/ProductionQueryHandler.cs b/src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/ProductionQueryHandler.cs similarity index 92% rename from src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/ProductionQueryHandler.cs rename to src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/ProductionQueryHandler.cs index f863a4769..1c5cd2476 100644 --- a/src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/ProductionQueryHandler.cs +++ b/src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/ProductionQueryHandler.cs @@ -1,7 +1,7 @@ // Copyright (c) MASA Stack All rights reserved. // Licensed under the MIT License. See LICENSE.txt in the project root for license information. -namespace Masa.Contrib.ReadWriteSpliting.Cqrs.Tests; +namespace Masa.Contrib.ReadWriteSplitting.Cqrs.Tests; public class ProductionQueryHandler : QueryHandler { diff --git a/src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/Queries/ProductionItemQuery.cs b/src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/Queries/ProductionItemQuery.cs similarity index 82% rename from src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/Queries/ProductionItemQuery.cs rename to src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/Queries/ProductionItemQuery.cs index ba32fe531..c80e333fa 100644 --- a/src/Contrib/ReadWriteSpliting/Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/Queries/ProductionItemQuery.cs +++ b/src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/Queries/ProductionItemQuery.cs @@ -3,7 +3,7 @@ -namespace Masa.Contrib.ReadWriteSpliting.Cqrs.Tests.Queries; +namespace Masa.Contrib.ReadWriteSplitting.Cqrs.Tests.Queries; public record ProductionItemQuery : Query { diff --git a/src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/_Imports.cs b/src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/_Imports.cs new file mode 100644 index 000000000..b037bc0f7 --- /dev/null +++ b/src/Contrib/ReadWriteSplitting/Tests/Masa.Contrib.ReadWriteSplitting.Cqrs.Tests/_Imports.cs @@ -0,0 +1,13 @@ +// Copyright (c) MASA Stack All rights reserved. +// Licensed under the MIT License. See LICENSE.txt in the project root for license information. + +global using Masa.BuildingBlocks.Dispatcher.Events; +global using Masa.BuildingBlocks.ReadWriteSplitting.Cqrs.Commands; +global using Masa.BuildingBlocks.ReadWriteSplitting.Cqrs.Queries; +global using Masa.Contrib.Dispatcher.Events; +global using Masa.Contrib.ReadWriteSplitting.Cqrs.Commands; +global using Masa.Contrib.ReadWriteSplitting.Cqrs.Queries; +global using Masa.Contrib.ReadWriteSplitting.Cqrs.Tests.Commands; +global using Masa.Contrib.ReadWriteSplitting.Cqrs.Tests.Queries; +global using Microsoft.Extensions.DependencyInjection; +global using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/test/Masa.Framework.IntegrationTests.EventBus/Application/Command/RegisterUserCommand.cs b/test/Masa.Framework.IntegrationTests.EventBus/Application/Command/RegisterUserCommand.cs index 5f90fd0d4..125728960 100644 --- a/test/Masa.Framework.IntegrationTests.EventBus/Application/Command/RegisterUserCommand.cs +++ b/test/Masa.Framework.IntegrationTests.EventBus/Application/Command/RegisterUserCommand.cs @@ -3,7 +3,7 @@ namespace Masa.Framework.IntegrationTests.EventBus.Application.Command; -public record RegisterUserCommand : BuildingBlocks.ReadWriteSpliting.Cqrs.Commands.Command +public record RegisterUserCommand : BuildingBlocks.ReadWriteSplitting.Cqrs.Commands.Command { public string Name { get; set; } diff --git a/test/Masa.Framework.IntegrationTests.EventBus/_Imports.cs b/test/Masa.Framework.IntegrationTests.EventBus/_Imports.cs index edfa56a09..cfbf1112f 100644 --- a/test/Masa.Framework.IntegrationTests.EventBus/_Imports.cs +++ b/test/Masa.Framework.IntegrationTests.EventBus/_Imports.cs @@ -8,7 +8,7 @@ global using Masa.BuildingBlocks.Ddd.Domain.Repositories; global using Masa.BuildingBlocks.Dispatcher.Events; global using Masa.BuildingBlocks.Dispatcher.IntegrationEvents; -global using Masa.BuildingBlocks.ReadWriteSpliting.Cqrs.Queries; +global using Masa.BuildingBlocks.ReadWriteSplitting.Cqrs.Queries; global using Masa.Contrib.Data.Contracts.EFCore; global using Masa.Contrib.Data.UoW.EFCore; global using Masa.Contrib.Ddd.Domain.Repository.EFCore;