chore: Refactoring of Serialization and Identity

Author: zhenlei520

src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/Serialization/DefaultDeserializerFactory.cs

@@ -1,15 +1,17 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
+// ReSharper disable once CheckNamespace
+
 namespace Masa.BuildingBlocks.Data;
 
-public class DefaultDeserializerFactory : MasaFactoryBase<IDeserializer, DeserializerRelationOptions>,
+public class DefaultDeserializerFactory : MasaFactoryBase<IDeserializer, MasaRelationOptions<IDeserializer>>,
     IDeserializerFactory
 {
     protected override string DefaultServiceNotFoundMessage => "Default deserializer not found, you need to add it, like services.AddJson()";
 
     protected override string SpecifyServiceNotFoundMessage => "Please make sure you have used [{0}] deserializer, it was not found";
-    protected override MasaFactoryOptions<DeserializerRelationOptions> FactoryOptions => _options.CurrentValue;
+    protected override MasaFactoryOptions<MasaRelationOptions<IDeserializer>> FactoryOptions => _options.CurrentValue;
 
     private readonly IOptionsMonitor<DeserializerFactoryOptions> _options;
 

src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/Serialization/DefaultSerializerFactory.cs

@@ -1,15 +1,17 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
+// ReSharper disable once CheckNamespace
+
 namespace Masa.BuildingBlocks.Data;
 
-public class DefaultSerializerFactory : MasaFactoryBase<ISerializer, SerializerRelationOptions>,
+public class DefaultSerializerFactory : MasaFactoryBase<ISerializer, MasaRelationOptions<ISerializer>>,
     ISerializerFactory
 {
     protected override string DefaultServiceNotFoundMessage => "Default serializer not found, you need to add it, like services.AddJson()";
 
     protected override string SpecifyServiceNotFoundMessage => "Please make sure you have used [{0}] serializer, it was not found";
-    protected override MasaFactoryOptions<SerializerRelationOptions> FactoryOptions => _options.CurrentValue;
+    protected override MasaFactoryOptions<MasaRelationOptions<ISerializer>> FactoryOptions => _options.CurrentValue;
 
     private readonly IOptionsMonitor<SerializerFactoryOptions> _options;
 

src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/Serialization/Extensions/ServiceCollectionExtensions.cs

@@ -2,16 +2,34 @@
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
 // ReSharper disable once CheckNamespace
+
 namespace Microsoft.Extensions.DependencyInjection;
 
 public static partial class ServiceCollectionExtensions
 {
-    public static void TryAddSerializationCore(this IServiceCollection services)
+    public static IServiceCollection AddSerialization(
+        this IServiceCollection services,
+        Action<SerializationBuilder> configure)
+        => services.AddSerialization(Options.Options.DefaultName, configure);
+
+    public static IServiceCollection AddSerialization(
+        this IServiceCollection services,
+        string name,
+        Action<SerializationBuilder> configure)
+    {
+        MasaApp.TrySetServiceCollection(services);
+        var builder = new SerializationBuilder(name, services);
+        configure.Invoke(builder);
+        return services.AddSerializationCore();
+    }
+
+    private static IServiceCollection AddSerializationCore(this IServiceCollection services)
     {
         services.TryAddSingleton<IDeserializerFactory, DefaultDeserializerFactory>();
         services.TryAddSingleton<ISerializerFactory, DefaultSerializerFactory>();
         services.TryAddSingleton(serviceProvider => serviceProvider.GetRequiredService<ISerializerFactory>().Create());
         services.TryAddSingleton(serviceProvider => serviceProvider.GetRequiredService<IDeserializerFactory>().Create());
         services.AddServiceFactory();
+        return services;
     }
 }

src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/Serialization/Internal/SerializationBuilderExtensions.cs

@@ -0,0 +1,24 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+[assembly: InternalsVisibleTo("Masa.Contrib.Data.Serialization.Json")]
+[assembly: InternalsVisibleTo("Masa.Contrib.Data.Serialization.Yaml")]
+
+// ReSharper disable once CheckNamespace
+
+namespace Masa.BuildingBlocks.Data;
+
+internal static class SerializationBuilderExtensions
+{
+    public static void UseSerialization(
+        this SerializationBuilder serializationBuilder,
+        Func<IServiceProvider, ISerializer> serializerFunc,
+        Func<IServiceProvider, IDeserializer> deserializerFunc)
+    {
+        serializationBuilder.Services.Configure<SerializerFactoryOptions>(
+            options => options.TryAdd(serializationBuilder.Name, serializerFunc));
+
+        serializationBuilder.Services.Configure<DeserializerFactoryOptions>(
+            options => options.TryAdd(serializationBuilder.Name, deserializerFunc));
+    }
+}

src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/Serialization/Options/DeserializerFactoryOptions.cs

@@ -1,24 +1,18 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
+// ReSharper disable once CheckNamespace
+
 namespace Masa.BuildingBlocks.Data;
 
-public class DeserializerFactoryOptions : MasaFactoryOptions<DeserializerRelationOptions>
+public class DeserializerFactoryOptions : MasaFactoryOptions<MasaRelationOptions<IDeserializer>>
 {
-    public DeserializerFactoryOptions MappingDeserializer(string name, Func<IServiceProvider, IDeserializer> func)
+    public void TryAdd(string name, Func<IServiceProvider, IDeserializer> func)
     {
-        var builder = Options.FirstOrDefault(b => b.Name == name.ToLower());
-        if (builder != null) builder.Func = func;
-        else Options.Add(new DeserializerRelationOptions(name.ToLower(), func));
-        return this;
-    }
+        if (Options.Any(opt => opt.Name.Equals(name, StringComparison.OrdinalIgnoreCase)))
+            throw new ArgumentException(
+                $"The deserializer name already exists, please change the name, the repeat name is [{name}]");
 
-    public Func<IServiceProvider, IDeserializer>? GetDeserializer()
-        => GetDeserializer(Microsoft.Extensions.Options.Options.DefaultName);
-
-    public Func<IServiceProvider, IDeserializer>? GetDeserializer(string name)
-    {
-        var deserializer = Options.FirstOrDefault(b => b.Name == name.ToLower());
-        return deserializer?.Func;
+        Options.Add(new MasaRelationOptions<IDeserializer>(name, func));
     }
 }

src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/Serialization/Options/DeserializerRelationOptions.cs

@@ -1,24 +1,18 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
+// ReSharper disable once CheckNamespace
+
 namespace Masa.BuildingBlocks.Data;
 
-public class SerializerFactoryOptions : MasaFactoryOptions<SerializerRelationOptions>
+public class SerializerFactoryOptions : MasaFactoryOptions<MasaRelationOptions<ISerializer>>
 {
-    public SerializerFactoryOptions MappingSerializer(string name, Func<IServiceProvider, ISerializer> func)
+    public void TryAdd(string name, Func<IServiceProvider, ISerializer> func)
     {
-        var builder = Options.FirstOrDefault(b => b.Name == name.ToLower());
-        if (builder != null) builder.Func = func;
-        else Options.Add(new SerializerRelationOptions(name.ToLower(), func));
-        return this;
-    }
+        if (Options.Any(opt => opt.Name.Equals(name, StringComparison.OrdinalIgnoreCase)))
+            throw new ArgumentException(
+                $"The serializer name already exists, please change the name, the repeat name is [{name}]");
 
-    public Func<IServiceProvider, ISerializer>? GetSerializer()
-        => GetSerializer(Microsoft.Extensions.Options.Options.DefaultName);
-
-    public Func<IServiceProvider, ISerializer>? GetSerializer(string name)
-    {
-        var serializer = Options.FirstOrDefault(b => b.Name == name.ToLower());
-        return serializer?.Func;
+        Options.Add(new MasaRelationOptions<ISerializer>(name, func));
     }
 }

src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/Serialization/Options/SerializerFactoryOptions.cs

@@ -0,0 +1,17 @@
+// 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.Data;
+
+public class SerializationBuilder
+{
+    public string Name { get; }
+
+    public IServiceCollection Services { get; }
+
+    public SerializationBuilder(string name, IServiceCollection services)
+    {
+        Name = name;
+        Services = services;
+    }
+}

src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/Serialization/Options/SerializerRelationOptions.cs

@@ -1,7 +1,9 @@
 // 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.Data;
+// ReSharper disable once CheckNamespace
+
+namespace Masa.BuildingBlocks.Data;
 
 public class DefaultTypeConvertProvider : ITypeConvertProvider
 {

src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/Serialization/SerializationBuilder.cs

@@ -2,8 +2,6 @@
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
 global using Masa.BuildingBlocks.Data;
-global using Masa.BuildingBlocks.Data.TypeConverts;
-global using Masa.Contrib.Data;
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.DependencyInjection.Extensions;
 global using Microsoft.Extensions.Options;

src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/TypeConverts/DefaultTypeConvertFactory.cs

@@ -12,10 +12,10 @@ public class BaseUserContext : IUserContext
     public string? UserId => _userContext.UserId;
     public string? UserName => _userContext.UserName;
 
-    public BaseUserContext(IServiceProvider serviceProvider)
+    public BaseUserContext(IUserContext userContext, ITypeConvertProvider typeConvertProvider)
     {
-        _userContext = serviceProvider.GetRequiredService<IUserContext>();
-        TypeConvertProvider = serviceProvider.GetRequiredService<ITypeConvertProvider>();
+        _userContext = userContext;
+        TypeConvertProvider = typeConvertProvider;
     }
 
     public TUserId? GetUserId<TUserId>() => _userContext.GetUserId<TUserId>();

src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/TypeConverts/DefaultTypeConvertProvider.cs

@@ -9,7 +9,8 @@ public class DefaultIsolatedUserContext : BaseUserContext, IIsolatedUserContext
 
     public string? Environment => GetUser<IsolatedIdentityUser>()?.Environment;
 
-    public DefaultIsolatedUserContext(IServiceProvider serviceProvider) : base(serviceProvider)
+    public DefaultIsolatedUserContext(IUserContext userContext, ITypeConvertProvider typeConvertProvider)
+        : base(userContext, typeConvertProvider)
     {
     }