WIP

RCommon-Team · Aug 12, 2024 · e6c5343 · e6c5343
1 parent be56169
commit e6c5343
Show file tree

Hide file tree

Showing 16 changed files with 94 additions and 42 deletions.
diff --git a/Examples/ApplicationServices/Examples.ApplicationServices.CQRS/Program.cs b/Examples/ApplicationServices/Examples.ApplicationServices.CQRS/Program.cs
@@ -6,6 +6,7 @@
 using RCommon;
 using RCommon.ApplicationServices;
 using RCommon.ApplicationServices.ExecutionResults;
+using RCommon.Caching;
 using RCommon.FluentValidation;
 using System.Diagnostics;
 using System.Reflection;
@@ -32,6 +33,7 @@
                             // Or this way which uses a little magic but is simple
                             cqrs.AddCommandHandlers((typeof(Program).GetTypeInfo().Assembly));
                             cqrs.AddQueryHandlers((typeof(Program).GetTypeInfo().Assembly));
+                            cqrs.AddMemoryCachingForHandlers<IMemoryCachingBuilder>();
                         })
                         .WithValidation<FluentValidationBuilder>(validation =>
                         {

diff --git a/Examples/Caching/Examples.Caching.MemoryCaching/Program.cs b/Examples/Caching/Examples.Caching.MemoryCaching/Program.cs
@@ -4,6 +4,8 @@
 using Microsoft.Extensions.Hosting;
 using RCommon;
 using RCommon.Caching;
+using RCommon.Json;
+using RCommon.JsonNet;
 using RCommon.MemoryCache;
 using System.Diagnostics;
 using System.Reflection;
@@ -21,6 +23,7 @@
                 {
                     // Configure RCommon
                     services.AddRCommon()
+                        .WithJsonSerialization<JsonNetBuilder>()
                         .WithMemoryCaching<MemoryCachingBuilder>(cache =>
                         {
                             cache.Configure(x =>

diff --git a/Examples/Caching/Examples.Caching.PersistenceCaching/Program.cs b/Examples/Caching/Examples.Caching.PersistenceCaching/Program.cs
@@ -19,7 +19,8 @@
                 .ConfigureServices(services =>
                 {
                     // Configure RCommon
-                    services.AddRCommon();
+                    services.AddRCommon()
+                        .WithJsonSerialization<JsonNetBuilder>();
                     
                     services.AddTransient<ITestApplicationService, TestApplicationService>();
                     

diff --git a/Examples/Caching/Examples.Caching.RedisCaching/Examples.Caching.RedisCaching.csproj b/Examples/Caching/Examples.Caching.RedisCaching/Examples.Caching.RedisCaching.csproj
@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\Src\RCommon.JsonNet\RCommon.JsonNet.csproj" />
+    <ProjectReference Include="..\..\..\Src\RCommon.Json\RCommon.Json.csproj" />
     <ProjectReference Include="..\..\..\Src\RCommon.RedisCache\RCommon.RedisCache.csproj" />
   </ItemGroup>
 

diff --git a/Examples/Caching/Examples.Caching.RedisCaching/Program.cs b/Examples/Caching/Examples.Caching.RedisCaching/Program.cs
@@ -1,9 +1,11 @@
 using Examples.Caching.RedisCaching;
+using RCommon.Json;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using RCommon;
 using RCommon.Caching;
+using RCommon.JsonNet;
 using RCommon.RedisCache;
 using System.Diagnostics;
 using System.Reflection;
@@ -21,6 +23,7 @@
                 {
                     // Configure RCommon
                     services.AddRCommon()
+                        .WithJsonSerialization<JsonNetBuilder>()
                         .WithDistributedCaching<RedisCachingBuilder>(cache =>
                         {
                             cache.Configure(redis =>

diff --git a/Src/RCommon.ApplicationServices/CqrsCachingOptions.cs b/Src/RCommon.ApplicationServices/CqrsCachingOptions.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RCommon.ApplicationServices
+{
+    public class CqrsCachingOptions
+    {
+        public CqrsCachingOptions()
+        {
+            this.UseCacheForHandlers = false;
+        }
+
+        public bool UseCacheForHandlers { get; set; }
+    }
+}
diff --git a/Src/RCommon.ApplicationServices/ICqrsBuilderExtensions.cs b/Src/RCommon.ApplicationServices/ICqrsBuilderExtensions.cs
@@ -0,0 +1,42 @@
+using RCommon.Caching;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RCommon.ApplicationServices
+{
+    public static class ICqrsBuilderExtensions
+    {
+        public static ICqrsBuilder AddMemoryCachingForHandlers<T>(this ICqrsBuilder builder)
+            where T : IMemoryCachingBuilder
+        {
+            return AddMemoryCachingForHandlers<T>(builder, x => { });
+        }
+
+        public static ICqrsBuilder AddMemoryCachingForHandlers<T>(this ICqrsBuilder builder, Action<T> actions)
+            where T : IMemoryCachingBuilder
+        {
+            Guard.IsNotNull(actions, nameof(actions));
+            var cachingConfig = (T)Activator.CreateInstance(typeof(T), new object[] { builder });
+            actions(cachingConfig);
+            return builder;
+        }
+
+        public static ICqrsBuilder AddDistributedCachingForHandlers<T>(this ICqrsBuilder builder)
+            where T : IDistributedCachingBuilder
+        {
+            return AddDistributedCachingForHandlers<T>(builder, x => { });
+        }
+
+        public static ICqrsBuilder AddDistributedCachingForHandlers<T>(this ICqrsBuilder builder, Action<T> actions)
+            where T : IDistributedCachingBuilder
+        {
+            Guard.IsNotNull(actions, nameof(actions));
+            var cachingConfig = (T)Activator.CreateInstance(typeof(T), new object[] { builder });
+            actions(cachingConfig);
+            return builder;
+        }
+    }
+}
diff --git a/Src/RCommon.ApplicationServices/Queries/QueryBus.cs b/Src/RCommon.ApplicationServices/Queries/QueryBus.cs
@@ -88,6 +88,7 @@ public async Task<TResult> DispatchQueryAsync<TResult>(IQuery<TResult> query, Ca
 
         private CacheItem GetCacheItem(Type queryType)
         {
+            if 
             return _memoryCache.GetOrCreate(
                 CacheKey.With(GetType(), queryType.GetCacheKey()),
                 e =>

diff --git a/Src/RCommon.ApplicationServices/RCommon.ApplicationServices.csproj b/Src/RCommon.ApplicationServices/RCommon.ApplicationServices.csproj
@@ -5,21 +5,16 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\RCommon.Caching\RCommon.Caching.csproj" />
     <ProjectReference Include="..\RCommon.Core\RCommon.Core.csproj" />
     <ProjectReference Include="..\RCommon.Entities\RCommon.Entities.csproj" />
   </ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
-		<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-		<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>
 
 </Project>
diff --git a/Src/RCommon.Caching/RCommon.Caching.csproj b/Src/RCommon.Caching/RCommon.Caching.csproj
@@ -1,10 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
+	</PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />

diff --git a/Src/RCommon.Json/RCommon.Json.csproj b/Src/RCommon.Json/RCommon.Json.csproj
@@ -1,10 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
+	</PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />

diff --git a/Src/RCommon.JsonNet/RCommon.JsonNet.csproj b/Src/RCommon.JsonNet/RCommon.JsonNet.csproj
@@ -1,10 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
+	</PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />

diff --git a/Src/RCommon.MemoryCache/RCommon.MemoryCache.csproj b/Src/RCommon.MemoryCache/RCommon.MemoryCache.csproj
@@ -1,10 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
+	</PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />

diff --git a/Src/RCommon.Persistence.Caching/RCommon.Persistence.Caching.csproj b/Src/RCommon.Persistence.Caching/RCommon.Persistence.Caching.csproj
@@ -1,10 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
+	</PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\RCommon.Caching\RCommon.Caching.csproj" />

diff --git a/Src/RCommon.RedisCache/RCommon.RedisCache.csproj b/Src/RCommon.RedisCache/RCommon.RedisCache.csproj
@@ -1,10 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
+	</PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.7" />

diff --git a/Src/RCommon.SystemTextJson/RCommon.SystemTextJson.csproj b/Src/RCommon.SystemTextJson/RCommon.SystemTextJson.csproj
@@ -1,10 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
+	</PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
-Original file line number
+Diff line change
@@ Expand Up @@
             private CacheItem GetCacheItem(Type queryType)
             {
+                if
                 return _memoryCache.GetOrCreate(
                     CacheKey.With(GetType(), queryType.GetCacheKey()),
                     e =>
@@ Expand Down @@