remove BinaryFormatter (#409)

* remove BinaryFormatter * chore: fix memcached ut fail * chore: fix memcached lock ut
dotnetcore · Oct 24, 2022 · 1f34f82 · 1f34f82
1 parent c2ccc4a
commit 1f34f82
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 148 deletions.
diff --git a/bus/EasyCaching.Bus.CSRedis/Configurations/CSRedisOptionsExtension.cs b/bus/EasyCaching.Bus.CSRedis/Configurations/CSRedisOptionsExtension.cs
@@ -41,8 +41,6 @@ public void AddServices(IServiceCollection services)
         {
             services.AddOptions();
 
-            services.TryAddSingleton<IEasyCachingSerializer, DefaultBinaryFormatterSerializer>();
-
             services.Configure(_name, _configure);
 
             services.AddSingleton<EasyCachingCSRedisClient>(x =>

diff --git a/bus/EasyCaching.Bus.ConfluentKafka/Configurations/ConfluentKafkaOptionsExtension.cs b/bus/EasyCaching.Bus.ConfluentKafka/Configurations/ConfluentKafkaOptionsExtension.cs
@@ -28,8 +28,6 @@ public void AddServices(IServiceCollection services)
         {
             services.AddOptions();
 
-            services.TryAddSingleton<IEasyCachingSerializer, DefaultBinaryFormatterSerializer>();
-
             services.AddOptions<ConfluentKafkaBusOptions>()
                 .Configure(_confluentKafkaBusOptions);
 

diff --git a/bus/EasyCaching.Bus.RabbitMQ/Configurations/RabbitMQBusOptionsExtension.cs b/bus/EasyCaching.Bus.RabbitMQ/Configurations/RabbitMQBusOptionsExtension.cs
@@ -37,7 +37,6 @@ public void AddServices(IServiceCollection services)
             services.AddOptions();
             services.Configure(configure);
 
-            services.TryAddSingleton<IEasyCachingSerializer, DefaultBinaryFormatterSerializer>();            
             services.AddSingleton<IPooledObjectPolicy<IModel>, ModelPooledObjectPolicy>();
             services.AddSingleton<IEasyCachingBus, DefaultRabbitMQBus>();
         }

diff --git a/bus/EasyCaching.Bus.Redis/Configurations/RedisBusOptionsExtension.cs b/bus/EasyCaching.Bus.Redis/Configurations/RedisBusOptionsExtension.cs
@@ -44,7 +44,6 @@ public void AddServices(IServiceCollection services)
             services.AddOptions();
             services.Configure(_name, configure);
 
-            services.TryAddSingleton<IEasyCachingSerializer, DefaultBinaryFormatterSerializer>();
             services.AddSingleton<IRedisSubscriberProvider, RedisSubscriberProvider>(x =>
             {
                 var optionsMon = x.GetRequiredService<IOptionsMonitor<RedisBusOptions>>();

diff --git a/bus/EasyCaching.Bus.Zookeeper/Configurations/ZookeeperOptionsExtension.cs b/bus/EasyCaching.Bus.Zookeeper/Configurations/ZookeeperOptionsExtension.cs
@@ -27,8 +27,6 @@ public void AddServices(IServiceCollection services)
         {
             services.AddOptions();
 
-            services.TryAddSingleton<IEasyCachingSerializer, DefaultBinaryFormatterSerializer>();
-
             services.AddOptions<ZkBusOptions>()
                 .Configure(_zkBusOptions);
 

diff --git a/src/EasyCaching.CSRedis/Configurations/RedisOptionsExtension.cs b/src/EasyCaching.CSRedis/Configurations/RedisOptionsExtension.cs
@@ -48,8 +48,7 @@ public void AddServices(IServiceCollection services)
         {
             services.AddOptions();
 
-            services.TryAddSingleton<IEasyCachingSerializer, DefaultBinaryFormatterSerializer>();
-
+
             services.Configure(_name, _configure);
 
             services.TryAddSingleton<IEasyCachingProviderFactory, DefaultEasyCachingProviderFactory>();

diff --git a/src/EasyCaching.Core/Serialization/DefaultBinaryFormatterSerializer.cs b/src/EasyCaching.Core/Serialization/DefaultBinaryFormatterSerializer.cs
diff --git a/src/EasyCaching.Memcached/Configurations/MemcachedOptionsExtension.cs b/src/EasyCaching.Memcached/Configurations/MemcachedOptionsExtension.cs
@@ -49,7 +49,6 @@ public void AddServices(IServiceCollection services)
 
             services.TryAddSingleton<IEasyCachingProviderFactory, DefaultEasyCachingProviderFactory>();
             services.TryAddSingleton<IMemcachedKeyTransformer, DefaultKeyTransformer>();
-            services.TryAddSingleton<IEasyCachingSerializer, DefaultBinaryFormatterSerializer>();
             services.AddSingleton<EasyCachingTranscoder>(x =>
             {
                 var optionsMon = x.GetRequiredService<IOptionsMonitor<MemcachedOptions>>();

diff --git a/src/EasyCaching.Redis/Configurations/RedisOptionsExtension.cs b/src/EasyCaching.Redis/Configurations/RedisOptionsExtension.cs
@@ -44,8 +44,6 @@ public RedisOptionsExtension(string name, Action<RedisOptions> configure)
         public void AddServices(IServiceCollection services)
         {
             services.AddOptions();
-
-            services.TryAddSingleton<IEasyCachingSerializer, DefaultBinaryFormatterSerializer>();
 
             services.Configure(_name, configure);
 

diff --git a/test/EasyCaching.PerformanceTests/SerializerBenchmark.cs b/test/EasyCaching.PerformanceTests/SerializerBenchmark.cs
@@ -18,7 +18,6 @@ public abstract class SerializerBenchmark
         private DefaultJsonSerializer _json = new DefaultJsonSerializer("json", new JsonSerializerSettings());
         private DefaultMessagePackSerializer _messagepack = new DefaultMessagePackSerializer("msgpack", new EasyCachingMsgPackSerializerOptions { });
         private DefaultProtobufSerializer _protobuf = new DefaultProtobufSerializer("proto");
-        private DefaultBinaryFormatterSerializer _binary = new DefaultBinaryFormatterSerializer();
         protected MyPoco _single;
         protected List<MyPoco> _list;
         private int _count;
@@ -39,12 +38,6 @@ public void Setup()
             _list = items;
         }
 
-        [Benchmark]
-        public void BinaryFormatter()
-        {
-            Exec(_binary);
-        }
-
         [Benchmark]
         public void Json()
         {

diff --git a/test/EasyCaching.UnitTests/CachingTests/MemcachedProviderTest.cs b/test/EasyCaching.UnitTests/CachingTests/MemcachedProviderTest.cs
@@ -24,8 +24,9 @@ protected override IEasyCachingProvider CreateCachingProvider(Action<BaseProvide
                 x.UseMemcached(options =>
                 {
                     options.DBConfig.AddServer("127.0.0.1", 11211);
+                    options.SerializerName = "msg";
                     additionalSetup(options);
-                }).UseMemcachedLock());
+                }).WithMessagePack("msg").UseMemcachedLock());
             services.AddLogging();
             IServiceProvider serviceProvider = services.BuildServiceProvider();
             return serviceProvider.GetService<IEasyCachingProvider>();
@@ -223,9 +224,18 @@ public MemcachedProviderWithFactoryTest()
             IServiceCollection services = new ServiceCollection();
             services.AddEasyCaching(x =>
             {
-                x.UseMemcached(options => { options.DBConfig.AddServer("127.0.0.1", 11212); }, SECOND_PROVIDER_NAME)
+                x.WithMessagePack("msg");
+                x.UseMemcached(options => 
+                { 
+                    options.DBConfig.AddServer("127.0.0.1", 11212);
+                    options.SerializerName = "msg";
+                }, SECOND_PROVIDER_NAME)
                     .UseMemcached(
-                        options => { options.DBConfig.AddServer("127.0.0.1", 11211); }, "MyTest");
+                        options => 
+                        { 
+                            options.DBConfig.AddServer("127.0.0.1", 11211);
+                            options.SerializerName = "msg";
+                        }, "MyTest");
             });
             services.AddLogging();
             IServiceProvider serviceProvider = services.BuildServiceProvider();
@@ -346,6 +356,7 @@ public MemcachedProviderUseEasyCachingTest()
             services.AddLogging();
             services.AddEasyCaching(option =>
             {
+                option.WithMessagePack("msg");
                 option.UseMemcached(config =>
                 {
                     config.DBConfig = new EasyCachingMemcachedClientOptions
@@ -355,6 +366,7 @@ public MemcachedProviderUseEasyCachingTest()
                             new Enyim.Caching.Configuration.Server() {Address = "127.0.0.1", Port = 11212}
                         }
                     };
+                    config.SerializerName = "msg";
                 }, EasyCachingConstValue.DefaultMemcachedName);
             });
 
@@ -372,7 +384,7 @@ public MemcachedProviderUseEasyCachingWithConfigTest()
         {
             IServiceCollection services = new ServiceCollection();
 
-            var appsettings = " { \"easycaching\": { \"memcached\": { \"MaxRdSecond\": 600, \"dbconfig\": { \"Servers\": [ { \"Address\": \"127.0.0.1\", \"Port\": 11211 } ] }  } }}";
+            var appsettings = " {\"easycaching\":{\"memcached\":{\"MaxRdSecond\":600,\"dbconfig\":{\"Servers\":[{\"Address\":\"127.0.0.1\",\"Port\":11211}]},\"SerializerName\":\"msg\"}}} ";
             var path = TestHelpers.CreateTempFile(appsettings);
             var directory = Path.GetDirectoryName(path);
             var fileName = Path.GetFileName(path);
@@ -382,7 +394,11 @@ public MemcachedProviderUseEasyCachingWithConfigTest()
             configurationBuilder.AddJsonFile(fileName);
             var config = configurationBuilder.Build();
             services.AddLogging();
-            services.AddEasyCaching(option => { option.UseMemcached(config, "mName"); });
+            services.AddEasyCaching(option => 
+            {
+                option.WithMessagePack("msg");
+                option.UseMemcached(config, "mName"); 
+            });
 
             IServiceProvider serviceProvider = services.BuildServiceProvider();
             _provider = serviceProvider.GetService<IEasyCachingProvider>();
@@ -407,6 +423,7 @@ public async void NoConnectionTest()
             services.AddLogging();
             services.AddEasyCaching(option =>
             {
+                option.WithMessagePack("msg");
                 option.UseMemcached(config =>
                 {
                     config.DBConfig = new EasyCachingMemcachedClientOptions
@@ -422,6 +439,7 @@ public async void NoConnectionTest()
                             ReceiveTimeout = TimeSpan.FromSeconds(2),
                         }
                     };
+                    config.SerializerName = "msg";
                 }, EasyCachingConstValue.DefaultMemcachedName);
             });
 

diff --git a/test/EasyCaching.UnitTests/DistributedLock/MemcachedLockTest.cs b/test/EasyCaching.UnitTests/DistributedLock/MemcachedLockTest.cs
@@ -12,17 +12,22 @@ public class MemcachedLockTest : DistributedLockTest
     {
         private static readonly IDistributedLockFactory Factory = new ServiceCollection()
             .AddLogging()
-            .AddEasyCaching(option => option.UseMemcached(config =>
+            .AddEasyCaching(option =>
+            {
+                option.WithMessagePack("msg");
+                option.UseMemcached(config =>
                 {
+                    config.SerializerName = "msg";
                     config.DBConfig = new EasyCachingMemcachedClientOptions
                     {
                         Servers =
                         {
                             new Server { Address = "127.0.0.1", Port = 11211 }
                         }
                     };
-                })
-                .UseMemcachedLock())
+                });
+                option.UseMemcachedLock();
+            })
             .BuildServiceProvider()
             .GetService<MemcachedLockFactory>();
 

diff --git a/test/EasyCaching.UnitTests/SerializerTests/BinaryFormatterSerializerTest.cs b/test/EasyCaching.UnitTests/SerializerTests/BinaryFormatterSerializerTest.cs