SettingsService follows OpenClosed Principle: Now it is possible to p…

…rovide own implementations of ISettingSerializer
marcwittke · Dec 13, 2017 · 70dfb4b · 70dfb4b
1 parent 45b268b
commit 70dfb4b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/src/Backend.Fx/ConfigurationSettings/SettingSerializerFactory.cs b/src/Backend.Fx/ConfigurationSettings/SettingSerializerFactory.cs
@@ -8,11 +8,11 @@ namespace Backend.Fx.ConfigurationSettings
 
     public class SettingSerializerFactory
     {
-        private readonly Dictionary<Type, ISettingSerializer> serializers;
+        protected Dictionary<Type, ISettingSerializer> Serializers { get; }
 
         public SettingSerializerFactory()
         {
-            serializers = typeof(ISettingSerializer)
+            Serializers = typeof(ISettingSerializer)
                 .GetTypeInfo()
                 .Assembly
                 .ExportedTypes
@@ -28,9 +28,9 @@ public SettingSerializerFactory()
         [NotNull]
         public ISettingSerializer<T> GetSerializer<T>()
         {
-            if (serializers.ContainsKey(typeof(T)))
+            if (Serializers.ContainsKey(typeof(T)))
             {
-                return (ISettingSerializer<T>) serializers[typeof(T)];
+                return (ISettingSerializer<T>) Serializers[typeof(T)];
             }
 
             throw new ArgumentOutOfRangeException(nameof(T), string.Format("No Serializer for Setting Type {0} available", typeof(T).Name));

diff --git a/src/Backend.Fx/ConfigurationSettings/SettingsService.cs b/src/Backend.Fx/ConfigurationSettings/SettingsService.cs
@@ -8,12 +8,13 @@ public abstract class SettingsService
     {
         private readonly IEntityIdGenerator idGenerator;
         private readonly IRepository<Setting> settingRepository;
-        private static readonly SettingSerializerFactory SettingSerializerFactory = new SettingSerializerFactory();
+        private readonly SettingSerializerFactory settingSerializerFactory;
 
-        protected SettingsService(IEntityIdGenerator idGenerator, IRepository<Setting> settingRepository)
+        protected SettingsService(IEntityIdGenerator idGenerator, IRepository<Setting> settingRepository, SettingSerializerFactory settingSerializerFactory)
         {
             this.idGenerator = idGenerator;
             this.settingRepository = settingRepository;
+            this.settingSerializerFactory = settingSerializerFactory;
         }
 
         protected T ReadSetting<T>(string key)
@@ -23,7 +24,7 @@ protected T ReadSetting<T>(string key)
             {
                 return default(T);
             }
-            var serializer = SettingSerializerFactory.GetSerializer<T>();
+            var serializer = settingSerializerFactory.GetSerializer<T>();
             return setting.GetValue(serializer);
         }
 
@@ -35,7 +36,7 @@ protected void WriteSetting<T>(string key, T value)
                 setting = new Setting(idGenerator.NextId(), key);
                 settingRepository.Add(setting);
             }
-            var serializer = SettingSerializerFactory.GetSerializer<T>();
+            var serializer = settingSerializerFactory.GetSerializer<T>();
             setting.SetValue(serializer, value);
         }
     }

diff --git a/tests/Backend.Fx.Tests/ConfigurationSettings/TheSetting.cs b/tests/Backend.Fx.Tests/ConfigurationSettings/TheSetting.cs
@@ -11,7 +11,8 @@ public class TheSetting
         public class TestSettingsService : SettingsService
         {
 
-            public TestSettingsService(IEntityIdGenerator idGenerator, IRepository<Setting> settingRepository) : base(idGenerator, settingRepository)
+            public TestSettingsService(IEntityIdGenerator idGenerator, IRepository<Setting> settingRepository) 
+                : base(idGenerator, settingRepository, new SettingSerializerFactory())
             { }
         }
 

diff --git a/tests/Backend.Fx.Tests/ConfigurationSettings/TheSettingsService.cs b/tests/Backend.Fx.Tests/ConfigurationSettings/TheSettingsService.cs
@@ -15,7 +15,8 @@ public class TheSettingsService
     {
         public class MySettingsService : SettingsService
         {
-            public MySettingsService(IEntityIdGenerator idGenerator,IRepository<Setting> repo) : base(idGenerator, repo)
+            public MySettingsService(IEntityIdGenerator idGenerator, IRepository<Setting> repo) 
+                : base(idGenerator, repo, new SettingSerializerFactory())
             {
             }
             public int SmtpPort