Fix DI registration for Settings

Author: Vogel612

Rubberduck.Main/Root/RubberduckIoCInstaller.cs

@@ -231,11 +231,13 @@ private void RegisterConfiguration(IWindsorContainer container, Assembly[] assem
             foreach (var assembly in assembliesToRegister)
             {
                 container.Register(Classes.FromAssembly(assembly)
-                    .IncludeNonPublicTypes()
-                    .Where(type => type.Namespace == typeof(Configuration).Namespace 
-                                   && type.NotDisabledOrExperimental(_initialSettings)
-                                   && type != typeof(ExperimentalTypesProvider))
-                    .WithService.AllInterfaces()
+                    .BasedOn(typeof(ConfigurationServiceBase<>))
+                    .WithServiceSelect((type, hierarchy) =>
+                    {
+                        // select closed generic interface
+                        return type.GetInterfaces().Where(iface => iface.IsGenericType 
+                            && iface.GetGenericTypeDefinition() == typeof(IConfigurationService<>));
+                    })
                     .LifestyleSingleton());
 
                 experimentalTypes.AddRange(assembly.GetTypes()
@@ -259,12 +261,8 @@ private void RegisterConfiguration(IWindsorContainer container, Assembly[] assem
                 .ImplementedBy(typeof(XmlContractPersistenceService<>))
                 .LifestyleSingleton());
 
-            container.Register(Component.For<IConfigurationService<IndenterSettings>>()
-                .ImplementedBy<IndenterConfigProvider>()
-                .LifestyleSingleton());
-
-            container.Register(Component.For<IConfigurationService<UnitTesting.Settings.UnitTestSettings>>()
-                .ImplementedBy<UnitTestConfigProvider>()
+            container.Register(Component.For(typeof(IConfigurationService<Configuration>))
+                .ImplementedBy(typeof(ConfigurationLoader))
                 .LifestyleSingleton());
         }
 

Rubberduck.SettingsProvider/Facade/ConfigurationServiceBase.cs

@@ -1,6 +1,5 @@
 using Rubberduck.Settings;
 using System;
-using System.Threading;
 
 namespace Rubberduck.SettingsProvider
 {

Rubberduck.SettingsProvider/Facade/DefaultSettings.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
@@ -10,6 +11,17 @@ public interface IDefaultSettings<T>
         T Default { get; }
     }
 
+    public class FixedValueDefault<T> : IDefaultSettings<T>
+    {
+        public IEnumerable<T> Defaults { get => new[] { Default }; }
+        public T Default { get; }
+
+        public FixedValueDefault(T value)
+        {
+            Default = value;
+        }
+    }
+
     public class DefaultSettings<T, S>  : IDefaultSettings<T>
         where S : System.Configuration.ApplicationSettingsBase
     {

Rubberduck.SettingsProvider/Facade/IConfigProvider.cs renamed to Rubberduck.SettingsProvider/Facade/IConfigurationService.cs

@@ -1,33 +1,12 @@
-using System;
+using Rubberduck.Settings;
 using Rubberduck.SettingsProvider;
 
 namespace Rubberduck.SmartIndenter
 {
-    public class IndenterConfigProvider : IConfigurationService<IndenterSettings>
+    public class IndenterConfigProvider : ConfigurationServiceBase<IndenterSettings>
     {
-        private readonly IPersistenceService<IndenterSettings> _persister;
-
         public IndenterConfigProvider(IPersistenceService<IndenterSettings> persister)
-        {
-            _persister = persister;
-        }
-
-        public event EventHandler<ConfigurationChangedEventArgs> SettingsChanged;
-
-        public IndenterSettings Read()
-        {
-            var prototype = new IndenterSettings(false);
-            return _persister.Load(prototype) ?? prototype;
-        }
-
-        public IndenterSettings ReadDefaults()
-        {
-            return new IndenterSettings(false);
-        }
-
-        public void Save(IndenterSettings settings)
-        {
-            _persister.Save(settings);
-        }
+            : base (persister, new FixedValueDefault<IndenterSettings>(new IndenterSettings(false)))
+        { }
     }
 }