👌 support custom resolver

Author: catcherwong

build/releasenotes.props

@@ -85,13 +85,7 @@
         1. Support JsonSerializerSettings.
         </EasyCachingJsonPackageNotes>
 		<EasyCachingMessagePackPackageNotes>
-        1. Make Interceptors and response caching Support .netcore3.0.
-        2. Remove WithServices method to support console apps.
-        3. Improve RabbitMQ bus.
-        4. Add deep clone for memory cache provider.
-        5. Support multi instances of hybrid provider.    
-        6. Upgrading dependencies.    
-        7. Modify some extension methods' namespace.
+        1. Support custom resolver.      
         </EasyCachingMessagePackPackageNotes>
 		<EasyCachingProtobufPackageNotes>
         1. Make Interceptors and response caching Support .netcore3.0.

build/version.props

@@ -10,7 +10,7 @@
 		<EasyCachingCastlePackageVersion>0.8.0</EasyCachingCastlePackageVersion>
 		<EasyCachingResponseCachingPackageVersion>0.8.0</EasyCachingResponseCachingPackageVersion>
 		<EasyCachingJsonPackageVersion>0.8.1</EasyCachingJsonPackageVersion>
-		<EasyCachingMessagePackPackageVersion>0.8.0</EasyCachingMessagePackPackageVersion>
+		<EasyCachingMessagePackPackageVersion>0.8.1-bata</EasyCachingMessagePackPackageVersion>
 		<EasyCachingProtobufPackageVersion>0.8.0</EasyCachingProtobufPackageVersion>
 		<EasyCachingCSRedisPackageVersion>0.8.1</EasyCachingCSRedisPackageVersion>
 		<EasyCachingRedisBusPackageVersion>0.8.0</EasyCachingRedisBusPackageVersion>

src/EasyCaching.Serialization.MessagePack/Configurations/EasyCachingMsgPackSerializerOptions.cs

@@ -0,0 +1,13 @@
+namespace EasyCaching.Serialization.MessagePack
+{
+    /// <summary>
+    /// EasyCachingMsgPackSerializerOptions
+    /// </summary>
+    public class EasyCachingMsgPackSerializerOptions
+    {
+        /// <summary>
+        /// Whethe to enable custom resolver
+        /// </summary>
+        public bool EnableCustomResolver { get; set; }
+    }
+}

src/EasyCaching.Serialization.MessagePack/Configurations/EasyCachingOptionsExtensions.cs

@@ -2,6 +2,7 @@
 {
     using EasyCaching.Core.Configurations;
     using EasyCaching.Serialization.MessagePack;
+    using System;
 
     /// <summary>
     /// Easy caching options extensions.
@@ -15,7 +16,25 @@ public static class EasyCachingOptionsExtensions
         /// <param name="name">The name of this serializer instance.</param>        
         public static EasyCachingOptions WithMessagePack(this EasyCachingOptions options, string name = "msgpack")
         {
-            options.RegisterExtension(new MessagePackOptionsExtension(name));
+            Action<EasyCachingMsgPackSerializerOptions> action = x => 
+            {
+                x.EnableCustomResolver = false;
+            };
+
+            options.RegisterExtension(new MessagePackOptionsExtension(name, action));
+
+            return options;
+        }
+
+        /// <summary>
+        /// Withs the message pack serializer.
+        /// </summary>        
+        /// <param name="options">Options.</param>
+        /// <param name="action">Configure serializer settings.</param>
+        /// <param name="name">The name of this serializer instance.</param>     
+        public static EasyCachingOptions WithMessagePack(this EasyCachingOptions options, Action<EasyCachingMsgPackSerializerOptions> action, string name)
+        {
+            options.RegisterExtension(new MessagePackOptionsExtension(name, action));
 
             return options;
         }

src/EasyCaching.Serialization.MessagePack/Configurations/MessagePackOptionsExtension.cs

@@ -3,6 +3,7 @@
     using EasyCaching.Core.Configurations;
     using EasyCaching.Core.Serialization;
     using Microsoft.Extensions.DependencyInjection;
+    using System;
 
     /// <summary>
     /// Message pack options extension.
@@ -14,14 +15,21 @@ internal sealed class MessagePackOptionsExtension : IEasyCachingOptionsExtension
         /// </summary>
         private readonly string _name;
 
+        /// <summary>
+        /// The configure.
+        /// </summary>
+        private readonly Action<EasyCachingMsgPackSerializerOptions> _configure;
+
         /// <summary>
         /// Initializes a new instance of the
         /// <see cref="T:EasyCaching.Serialization.MessagePack.MessagePackOptionsExtension"/> class.
         /// </summary>
         /// <param name="name">Name.</param>
-        public MessagePackOptionsExtension(string name)
+        /// <param name="configure">Configure.</param>
+        public MessagePackOptionsExtension(string name, Action<EasyCachingMsgPackSerializerOptions> configure)
         {
             this._name = name;
+            this._configure = configure;
         }
 
         /// <summary>
@@ -30,9 +38,17 @@ public MessagePackOptionsExtension(string name)
         /// <param name="services">Services.</param>
         public void AddServices(IServiceCollection services)
         {
+            Action<EasyCachingMsgPackSerializerOptions> configure = x => { };
+
+            if (_configure != null) configure = _configure;
+
+            services.AddOptions();
+            services.Configure(_name, configure);
             services.AddSingleton<IEasyCachingSerializer, DefaultMessagePackSerializer>(x =>
             {
-                return new DefaultMessagePackSerializer(_name);
+                var optionsMon = x.GetRequiredService<Microsoft.Extensions.Options.IOptionsMonitor<EasyCachingMsgPackSerializerOptions>>();
+                var options = optionsMon.Get(_name);
+                return new DefaultMessagePackSerializer(_name, options);
             });
         }
     }

src/EasyCaching.Serialization.MessagePack/DefaultMessagePackSerializer.cs

@@ -20,10 +20,16 @@ public class DefaultMessagePackSerializer : IEasyCachingSerializer
         /// <see cref="T:EasyCaching.Serialization.MessagePack.DefaultMessagePackSerializer"/> class.
         /// </summary>
         /// <param name="name">Name.</param>
-        public DefaultMessagePackSerializer(string name)
+        /// <param name="options">Options.</param>
+        public DefaultMessagePackSerializer(string name, EasyCachingMsgPackSerializerOptions options)
         {
             _name = name;
-            MessagePackSerializer.SetDefaultResolver(ContractlessStandardResolver.Instance);
+
+            if (!options.EnableCustomResolver)
+            {
+                MessagePackSerializer.SetDefaultResolver(ContractlessStandardResolver.Instance);
+            }
+
         }
 
         /// <summary>
@@ -84,6 +90,5 @@ public object DeserializeObject(ArraySegment<byte> value)
         {
             return MessagePackSerializer.Deserialize<object>(value, TypelessContractlessStandardResolver.Instance);
         }
-
     }
 }

src/EasyCaching.Serialization.MessagePack/EasyCaching.Serialization.MessagePack.csproj

@@ -36,7 +36,4 @@
   <ItemGroup>
     <PackageReference Include="MessagePack" Version="1.7.3.7" />    
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Configurations\" />
-  </ItemGroup>
 </Project>

test/EasyCaching.PerformanceTests/SerializerBenchmark.cs

@@ -16,7 +16,7 @@
     public abstract class SerializerBenchmark
     {
         private DefaultJsonSerializer _json = new DefaultJsonSerializer("json", new JsonSerializerSettings());
-        private DefaultMessagePackSerializer _messagepack = new DefaultMessagePackSerializer("msgpack");
+        private DefaultMessagePackSerializer _messagepack = new DefaultMessagePackSerializer("msgpack", new EasyCachingMsgPackSerializerOptions { });
         private DefaultProtobufSerializer _protobuf = new DefaultProtobufSerializer("proto");
         private DefaultBinaryFormatterSerializer _binary = new DefaultBinaryFormatterSerializer();
         protected MyPoco _single;

test/EasyCaching.UnitTests/SerializerTests/MessagePackSerializerTest.cs

@@ -1,12 +1,60 @@
 namespace EasyCaching.UnitTests
 {
     using EasyCaching.Serialization.MessagePack;
+    using MessagePack.Resolvers;
+    using System;
+    using Xunit;
 
     public class MessagePackSerializerTest : BaseSerializerTest
     {
         public MessagePackSerializerTest()
         {
-            _serializer = new DefaultMessagePackSerializer("msgpack");
+            _serializer = new DefaultMessagePackSerializer("msgpack", new EasyCachingMsgPackSerializerOptions { });       
+        }
+    }
+
+    public class MessagePackSerializerTest2 //: BaseSerializerTest
+    {
+        DefaultMessagePackSerializer _serializer;
+
+        public MessagePackSerializerTest2()
+        {
+            CompositeResolver.RegisterAndSetAsDefault(
+               // This can solve DateTime time zone problem
+               NativeDateTimeResolver.Instance,
+               ContractlessStandardResolver.Instance
+           );
+
+            _serializer = new DefaultMessagePackSerializer("msgpack", new EasyCachingMsgPackSerializerOptions { EnableCustomResolver = true });
+        }
+
+        [Fact]
+        public void Issue_174_DateTime_Test()
+        {
+            var dt1 = DateTime.Parse("2019-11-07 10:30:30");
+
+            var s1 = _serializer.Serialize(new DT { Dt = dt1 });
+
+            Assert.NotEmpty(s1);
+
+            var res1 = _serializer.Deserialize<DT>(s1);
+
+            Assert.Equal(dt1, res1.Dt);
+
+            var dt = DateTime.Parse("2019-11-07 10:30:30").ToUniversalTime();
+
+            var s = _serializer.Serialize(new DT { Dt = dt });
+
+            Assert.NotEmpty(s);
+
+            var res = _serializer.Deserialize<DT>(s);
+
+            Assert.Equal(dt, res.Dt);
+        }     
+
+        public class DT
+        {
+            public DateTime Dt { get; set; }
         }
     }
 }