WIP

Author: Erwinvandervalk

src/Config.SqlStreamStore.Tests/StreamStoreConfigurationProvider.cs

@@ -9,58 +9,18 @@ namespace Config.SqlStreamStore
 {
     public class StreamStoreConfigurationProvider : ConfigurationProvider
     {
-        private bool _loaded = false;
-        private readonly Func<IConfigRepository> _getConfigRepository;
-        private IConfigRepository _configRepository;
+        private readonly IConfigRepository _configRepository;
 
-        public StreamStoreConfigurationProvider(Func<IConfigRepository> getConfigRepository)
+        public StreamStoreConfigurationProvider(IConfigRepository configRepository)
         {
-            _getConfigRepository = getConfigRepository;
+            _configRepository = configRepository;
         }
-
-        public override bool TryGet(string key, out string value)
-        {
-            if (!_loaded)
-            {
-                LoadSettings();
-            }
-
-            return Data.TryGetValue(key, out value);
-        }
-
-        private void LoadSettings()
+        public override void Load()
         {
-            if (GetConfigRepository() == null)
-            {
-                throw new InvalidOperationException("The configuration repository has not yet been initialized.");
-            }
-
-            var settings = GetConfigRepository()
+            var settings = _configRepository
                 .GetLatest(CancellationToken.None).GetAwaiter().GetResult();
 
             Data = settings.ToDictionary(x => x.Key, x => x.Value, StringComparer.OrdinalIgnoreCase);
-
-            _loaded = true;
-        }
-
-
-        IConfigRepository GetConfigRepository()
-        {
-            if (_configRepository == null)
-            {
-                _configRepository = _getConfigRepository();
-            }
-
-            return _configRepository;
-        }
-
-        public override void Load()
-        {
-            if (GetConfigRepository() != null)
-            {
-                LoadSettings();
-            }
-
         }
     }
 }

src/Config.SqlStreamStore/StreamStoreConfigurationProvider.cs

@@ -6,59 +6,67 @@ namespace Config.SqlStreamStore
 {
     public class StreamStoreConfigurationSource : IConfigurationSource
     {
-        private readonly string _connectionStringKey;
-        private readonly Func<IConfigRepository> _getConfigRepository;
-        private Func<string, IStreamStore> _streamStoreFactory;
+        private readonly BuildStreamStoreFromConfig _buildStreamStoreFromConfig;
 
-        public StreamStoreConfigurationSource(string connectionStringKey, Func<string, IStreamStore> streamStoreFactory)
+        public delegate IStreamStore BuildStreamStoreFromConnectionString(string connectionString);
+        public delegate IStreamStore BuildStreamStoreFromConfig(IConfigurationRoot configurationRoot);
+
+        public delegate IConfigRepository BuildConfigRepository();
+
+        private readonly BuildConfigRepository _getConfigRepository;
+
+        public StreamStoreConfigurationSource(BuildStreamStoreFromConfig buildStreamStoreFromConfig)
         {
-            _connectionStringKey = connectionStringKey;
-            _streamStoreFactory = streamStoreFactory;
+            _buildStreamStoreFromConfig = buildStreamStoreFromConfig;
         }
 
-        public StreamStoreConfigurationSource(Func<IStreamStore> getStreamStore) :
-            this(() =>
+        public StreamStoreConfigurationSource(string connectionStringKey, BuildStreamStoreFromConnectionString streamStoreFactory)
+        {
+            _buildStreamStoreFromConfig = (c =>
             {
-                var streamStore = getStreamStore();
-                if (streamStore == null) return null;
+                var connectionString = c[connectionStringKey];
+
+                if (string.IsNullOrEmpty(connectionString))
+                {
+                    throw new InvalidOperationException(
+                        $"Cannot create SqlStreamStore repository, becuase connection string (key: '{connectionStringKey}') has not been configured.");
+                }
+
+                return streamStoreFactory(connectionString);
+            });
+        }
 
-                return new ConfigRepository(streamStore);
-            })
+        public StreamStoreConfigurationSource(Func<IStreamStore> getStreamStore) :
+            this(() => new ConfigRepository(getStreamStore()))
         {
 
         }
 
-        public StreamStoreConfigurationSource(Func<IConfigRepository> getConfigRepository)
+        public StreamStoreConfigurationSource(BuildConfigRepository getConfigRepository)
         {
             _getConfigRepository = getConfigRepository;
         }
 
         public IConfigurationProvider Build(IConfigurationBuilder builder)
         {
-            if (_getConfigRepository == null)
+            if (_getConfigRepository != null)
             {
-                var innerBuilder = new ConfigurationBuilder();
-                foreach (var source in builder.Sources)
-                {
-                    if (source != this)
-                    {
-                        innerBuilder.Add(source);
-                    }
-                }
-
-                var connectionString = innerBuilder.Build()[_connectionStringKey];
+                return new StreamStoreConfigurationProvider(_getConfigRepository());
+            }
 
-                if (string.IsNullOrEmpty(connectionString))
+            var innerBuilder = new ConfigurationBuilder();
+            foreach (var source in builder.Sources)
+            {
+                if (source != this)
                 {
-                    throw new InvalidOperationException($"Cannot create SqlStreamStore repository, becuase connection string (key: '{_connectionStringKey}') has not been configured.");
+                    innerBuilder.Add(source);
                 }
-
-                var repo = new ConfigRepository(_streamStoreFactory(connectionString));
-
-                return new StreamStoreConfigurationProvider(() => repo);
             }
 
-            return new StreamStoreConfigurationProvider(_getConfigRepository);
+            var repo = new ConfigRepository(_buildStreamStoreFromConfig(innerBuilder.Build()));
+
+            return new StreamStoreConfigurationProvider(repo);
+        
         }