8000 refactor!: move dependency injector to feature project · cnblogs/Architecture@15b02bc · GitHub
[go: up one dir, main page]
Skip to content

Commit 15b02bc

Browse files

Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.Cq
2828
EndProject
2929
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.Infrastructure.RedLock", "src\Cnblogs.Architecture.Ddd.Infrastructure.RedLock\Cnblogs.Architecture.Ddd.Infrastructure.RedLock.csproj", "{98B77844-CBA5-4E57-96B1-AD538788EA6D}"
3030
EndProject
31-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.RedLock", "src\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.RedLock\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.RedLock.csproj", "{AAF07CE2-7124-4A19-BA2B-361506FA54CC}"
32-
EndProject
3331
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.EventBus.Abstractions", "src\Cnblogs.Architecture.Ddd.EventBus.Abstractions\Cnblogs.Architecture.Ddd.EventBus.Abstractions.csproj", "{D4894BA9-BFFB-4731-A12D-C742C8308F8C}"
3432
EndProject
3533
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.EventBus.Dapr", "src\Cnblogs.Architecture.Ddd.EventBus.Dapr\Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj", "{5B20CD42-148C-440E-A961-9909CC1517E7}"
@@ -42,12 +40,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Integr
4240
EndProject
4341
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory", "src\Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory\Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj", "{749EA5B9-69BE-44E0-802D-8BEAE2EA5E77}"
4442
EndProject
45-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.CacheProviders.InMemory", "src\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.CacheProviders.InMemory\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.CacheProviders.InMemory.csproj", "{ACE6DB92-C943-4D99-909E-DCEC551E4394}"
46-
EndProject
4743
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer", "src\Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer\Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer.csproj", "{AC1BB624-1B37-4A21-9CA4-FB79E4D30C43}"
4844
EndProject
49-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr", "src\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr.csproj", "{5AE74304-8F14-4CF7-9BA7-89AB345AFE29}"
50-
EndProject
5145
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent", "src\Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent\Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj", "{F2B0D83B-9A90-4FA4-A407-3B0708731903}"
5246
EndProject
5347
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.TestIntegrationEvents", "test\Cnblogs.Architecture.TestIntegrationEvents\Cnblogs.Architecture.TestIntegrationEvents.csproj", "{FCAE0DFB-1585-4ABA-A6FC-6A78311E3FE6}"
@@ -81,16 +75,13 @@ Global
8175
{92E2453C-2A6A-43E2-978C-C28E9025D0D9} = {772497F8-2CB1-4EA6-AEB8-482C3ECD0A9D}
8276
{870A738A-19CD-43D9-986A-D696263E3254} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
8377
{98B77844-CBA5-4E57-96B1-AD538788EA6D} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
84-
{AAF07CE2-7124-4A19-BA2B-361506FA54CC} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
8578
{D4894BA9-BFFB-4731-A12D-C742C8308F8C} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
8679
{5B20CD42-148C-440E-A961-9909CC1517E7} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
8780
{A9983E36-786D-4273-98EA-DD5FB410C206} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
8881
{0114DFFF-47DB-4D01-A88F-8812672A5B4D} = {772497F8-2CB1-4EA6-AEB8-482C3ECD0A9D}
8982
{F150EBB2-8237-4C68-B2DC-B86E6A9F7444} = {772497F8-2CB1-4EA6-AEB8-482C3ECD0A9D}
9083
{749EA5B9-69BE-44E0-802D-8BEAE2EA5E77} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
91-
{ACE6DB92-C943-4D99-909E-DCEC551E4394} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
9284
{AC1BB624-1B37-4A21-9CA4-FB79E4D30C43} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
93-
{5AE74304-8F14-4CF7-9BA7-89AB345AFE29} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
9485
{F2B0D83B-9A90-4FA4-A407-3B0708731903} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
9586
{FCAE0DFB-1585-4ABA-A6FC-6A78311E3FE6} = {772497F8-2CB1-4EA6-AEB8-482C3ECD0A9D}
9687
{2D8FE8C4-EA9A-4232-8767-6FFC68C87816} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
@@ -138,10 +129,6 @@ Global
138129
{98B77844-CBA5-4E57-96B1-AD538788EA6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
139130
{98B77844-CBA5-4E57-96B1-AD538788EA6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
140131
{98B77844-CBA5-4E57-96B1-AD538788EA6D}.Release|Any CPU.Build.0 = Release|Any CPU
141-
{AAF07CE2-7124-4A19-BA2B-361506FA54CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
142-
{AAF07CE2-7124-4A19-BA2B-361506FA54CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
143-
{AAF07CE2-7124-4A19-BA2B-361506FA54CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
144-
{AAF07CE2-7124-4A19-BA2B-361506FA54CC}.Release|Any CPU.Build.0 = Release|Any CPU
145132
{D4894BA9-BFFB-4731-A12D-C742C8308F8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
146133
{D4894BA9-BFFB-4731-A12D-C742C8308F8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
147134
{D4894BA9-BFFB-4731-A12D-C742C8308F8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -166,18 +153,10 @@ Global
166153
{749EA5B9-69BE-44E0-802D-8BEAE2EA5E77}.Debug|Any CPU.Build.0 = Debug|Any CPU
167154
{749EA5B9-69BE-44E0-802D-8BEAE2EA5E77}.Release|Any CPU.ActiveCfg = Release|Any CPU
168155
{749EA5B9-69BE-44E0-802D-8BEAE2EA5E77}.Release|Any CPU.Build.0 = Release|Any CPU
169-
{ACE6DB92-C943-4D99-909E-DCEC551E4394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
170-
{ACE6DB92-C943-4D99-909E-DCEC551E4394}.Debug|Any CPU.Build.0 = Debug|Any CPU
171-
{ACE6DB92-C943-4D99-909E-DCEC551E4394}.Release|Any CPU.ActiveCfg = Release|Any CPU
172-
{ACE6DB92-C943-4D99-909E-DCEC551E4394}.Release|Any CPU.Build.0 = Release|Any CPU
173156
{AC1BB624-1B37-4A21-9CA4-FB79E4D30C43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
174157
{AC1BB624-1B37-4A21-9CA4-FB79E4D30C43}.Debug|Any CPU.Build.0 = Debug|Any CPU
175158
{AC1BB624-1B37-4A21-9CA4-FB79E4D30C43}.Release|Any CPU.ActiveCfg = Release|Any CPU
176159
{AC1BB624-1B37-4A21-9CA4-FB79E4D30C43}.Release|Any CPU.Build.0 = Release|Any CPU
177-
{5AE74304-8F14-4CF7-9BA7-89AB345AFE29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
178-
{5AE74304-8F14-4CF7-9BA7-89AB345AFE29}.Debug|Any CPU.Build.0 = Debug|Any CPU
179-
{5AE74304-8F14-4CF7-9BA7-89AB345AFE29}.Release|Any CPU.ActiveCfg = Release|Any CPU
180-
{5AE74304-8F14-4CF7-9BA7-89AB345AFE29}.Release|Any CPU.Build.0 = Release|Any CPU
181160
{F2B0D83B-9A90-4FA4-A407-3B0708731903}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
182161
{F2B0D83B-9A90-4FA4-A407-3B0708731903}.Debug|Any CPU.Build.0 = Debug|Any CPU
183162
{F2B0D83B-9A90-4FA4-A407-3B0708731903}.Release|Any CPU.ActiveCfg = Release|Any CPU
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
</Description>
66
</PropertyGroup>
77
<ItemGroup>
8-
<ProjectReference Include="..\Cnblogs.Architecture.Ddd.EventBus.Abstractions\Cnblogs.Architecture.Ddd.EventBus.Abstractions.csproj"/>
9-
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
8+
<ProjectReference Include="..\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.csproj" />
9+
<ProjectReference Include="..\Cnblogs.Architecture.Ddd.EventBus.Abstractions\Cnblogs.Architecture.Ddd.EventBus.Abstractions.csproj" />
10+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1011
</ItemGroup>
1112
<ItemGroup>
12-
<PackageReference Include="Dapr.AspNetCore" Version="1.10.0"/>
13+
<PackageReference Include="Dapr.AspNetCore" Version="1.10.0" />
1314
</ItemGroup>
1415
</Project>
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
using System.Reflection;
2+
using Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection;
23
using Cnblogs.Architecture.Ddd.EventBus.Abstractions;
34
using Microsoft.Extensions.DependencyInjection;
45

5-
namespace Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr;
6+
namespace Cnblogs.Architecture.Ddd.EventBus.Dapr;
67

78
/// <summary>
89
/// 添加 Dapr 到 <see cref="CqrsInjector"/>
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Reflection;
2-
using Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr;
32
using Cnblogs.Architecture.Ddd.EventBus.Abstractions;
43
using Cnblogs.Architecture.Ddd.EventBus.Dapr;
54
using Dapr.Client;
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<ProjectReference Include="..\Cnblogs.Architecture.Ddd.Infrastructure.Abstractions\Cnblogs.Architecture.Ddd.Infrastructure.Abstractions.csproj"/>
10+
<ProjectReference Include="..\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.csproj" />
11+
<ProjectReference Include="..\Cnblogs.Architecture.Ddd.Infrastructure.Abstractions\Cnblogs.Architecture.Ddd.Infrastructure.Abstractions.csproj" />
1112
</ItemGroup>
1213

1314
<ItemGroup>
14-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0"/>
15+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
1516
</ItemGroup>
1617

1718
</Project>
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Cnblogs.Architecture.Ddd.Cqrs.Abstractions;
2-
using Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory;
2+
using Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection;
33

4-
namespace Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.CacheProviders.InMemory;
4+
namespace Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory;
55

66
/// <summary>
77
/// <see cref="CqrsInjector"/> 的扩展方法。
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ namespace Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse;
44
/// The options for clickhouse context.
55
/// </summary>
66
/// <typeparam name="TContext">The type of <see cref="ClickhouseDapperContext"/> been configured.</typeparam>
7+
// ReSharper disable once UnusedTypeParameter
78
public class ClickhouseContextOptions<TContext> : ClickhouseContextOptions
89
where TContext : ClickhouseDapperContext
910
{
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ internal ClickhouseModelBuilder()
1616
{
1717
_tableName = typeof(T).Name;
1818
_propertyBuilders = typeof(T).GetProperties().Where(x => x.GetGetMethod() != null)
19-
.Select(x => new ClickhouseModelPropertyBuilder<T>(this, x)).ToDictionary(x => x.PropertyInfo.Name, x => x);
19+
.Select(x => new ClickhouseModelPropertyBuilder<T>(x)).ToDictionary(x => x.PropertyInfo.Name, x => x);
2020
}
2121

2222
/// <summary>
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ public class ClickhouseModelPropertyBuilder<TEntity>
1111
/// <summary>
1212
/// Create a ClickhouseModelPropertyBuilder from entity builder.
1313
/// </summary>
14-
/// <param name="entityBuilder">The parent entity builder.</param>
1514
/// <param name="propertyInfo">The property been configured.</param>
16-
public ClickhouseModelPropertyBuilder(ClickhouseModelBuilder<TEntity> entityBuilder, PropertyInfo propertyInfo)
15+
public ClickhouseModelPropertyBuilder(PropertyInfo propertyInfo)
1716
{
1817
PropertyInfo = propertyInfo;
1918
ColumnName = propertyInfo.Name;
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Dapper" Version="2.0.123"/>
13-
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1"/>
12+
<PackageReference Include="Dapper" Version="2.0.123" />
13+
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
1414
</ItemGroup>
1515

1616
</Project>
Original file line numberDiff line numberDiff line change
@@ -186,14 +186,7 @@ public TEntity Update(TEntity entity)
186186
}
187187

188188
_toUpdate ??= new Dictionary<TKey, TEntity>();
189-
if (_toUpdate.ContainsKey(entity.Id))
190-
{
191-
_toUpdate[entity.Id] = entity;
192-
}
193-
else
194-
{
195-
_toUpdate.Add(entity.Id, entity);
196-
}
189+
_toUpdate[entity.Id] = entity;
197190

198191
return entity;
199192
}
@@ -209,14 +202,7 @@ public TEntity Delete(TEntity entity)
209202
}
210203

211204
_toDelete ??= new Dictionary<TKey, TEntity>();
212-
if (_toDelete.ContainsKey(entity.Id))
213-
{
214-
_toDelete[entity.Id] = entity;
215-
}
216-
else
217-
{
218-
_toDelete.Add(entity.Id, entity);
219-
}
205+
_toDelete[entity.Id] = entity;
220206

221207
return entity;
222208
}
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,7 @@ protected MongoContextOptions(string connectionString, string databaseName)
5151
public void MapEntity<TEntity>(string collectionName)
5252
{
5353
var type = typeof(TEntity);
54-
if (_collectionMap.ContainsKey(type))
55-
{
56-
_collectionMap[type] = collectionName;
57-
}
58-
else
59-
{
60-
_collectionMap.Add(type, collectionName);
61-
}
54+
_collectionMap[type] = collectionName;
6255
}
6356

6457
/// <inheritdoc />
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12+
<ProjectReference Include="..\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.csproj" />
1213
<ProjectReference Include="..\Cnblogs.Architecture.Ddd.Infrastructure.Abstractions\Cnblogs.Architecture.Ddd.Infrastructure.Abstractions.csproj" />
1314
</ItemGroup>
1415

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
using Cnblogs.Architecture.Ddd.Infrastructure.RedLock;
2-
1+
using Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection;
32
using Microsoft.Extensions.Configuration;
43
using Microsoft.Extensions.DependencyInjection;
54
using Microsoft.Extensions.Options;
6-
75
using RedLockNet.SERedis;
86
using RedLockNet.SERedis.Configuration;
9-
107
using StackExchange.Redis;
118

12-
namespace Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.RedLock;
9+
namespace Cnblogs.Architecture.Ddd.Infrastructure.RedLock;
1310

1411
/// <summary>
1512
/// 用于向 <see cref="CqrsInjector" /> 注入 RedLock 的扩展方法。
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
<ItemGroup>
88
<ProjectReference Include="..\..\src\Cnblogs.Architecture.Ddd.Cqrs.AspNetCore\Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj" />
9-
<ProjectReference Include="..\..\src\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr.csproj" />
109
<ProjectReference Include="..\Cnblogs.Architecture.TestIntegrationEvents\Cnblogs.Architecture.TestIntegrationEvents.csproj" />
1110
</ItemGroup>
1211

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Reflection;
22
using Cnblogs.Architecture.Ddd.Cqrs.AspNetCore;
3-
using Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr;
3+
using Cnblogs.Architecture.Ddd.EventBus.Dapr;
44
using Cnblogs.Architecture.IntegrationTestProject;
55
using Cnblogs.Architecture.IntegrationTestProject.Application.Commands;
66
using Cnblogs.Architecture.IntegrationTestProject.Application.Queries;
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<ProjectReference Include="..\..\src\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr.csproj" />
1918
<ProjectReference Include="..\..\src\Cnblogs.Architecture.Ddd.Cqrs.EntityFramework\Cnblogs.Architecture.Ddd.Cqrs.EntityFramework.csproj" />
2019
<ProjectReference Include="..\..\src\Cnblogs.Architecture.Ddd.Cqrs.MongoDb\Cnblogs.Architecture.Ddd.Cqrs.MongoDb.csproj" />
2120
<ProjectReference Include="..\Cnblogs.Architecture.TestIntegrationEvents\Cnblogs.Architecture.TestIntegrationEvents.csproj" />