MEF corrections

Don't trust the examples from M$
Unsettling · Aug 27, 2019 · f527f5e · f527f5e
1 parent d7ac412
commit f527f5e
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 66 deletions.
diff --git a/src/FeatureFlagger.ConfigurationReaders/ConfigReader.cs b/src/FeatureFlagger.ConfigurationReaders/ConfigReader.cs
@@ -1,28  1,15 @@
 namespace FeatureFlagger.ConfigurationReaders
 {
-    using System;
     using System.Collections.Generic;
     using System.Composition;
     using System.Configuration;
-    using System.Linq;
 
     using FeatureFlagger.Domain;
 
     [Export(typeof(IConfigurationReader)),
         ExportMetadata(Constants.Reader, Constants.Config)]
     public class ConfigReader : IConfigurationReader
     {
-        // NOTE: this method is the same for StoreReader.
-        public Feature Read(string featureName, IEnumerable<Feature> features)
-        {
-            return
-                features.ToList()
-                    .Find(
-                        f =>
-                        f.Name.Equals(
-                            featureName,
-                            StringComparison.OrdinalIgnoreCase));
-        }
-
         public IEnumerable<Feature> ReadAll()
         {
             return (List<Feature>)ConfigurationManager.GetSection("features");

diff --git a/src/FeatureFlagger.ConfigurationReaders/Constants.cs b/src/FeatureFlagger.ConfigurationReaders/Constants.cs
@@ -3,7  3,7 @@ namespace FeatureFlagger.ConfigurationReaders
     public static class Constants
     {
         public const string Config = "CONFIG";
-        public const string Reader = "READER";
         public const string Reader = "Reader";
         public const string Store  = "STORE";
     }
 }
diff --git a/src/FeatureFlagger.ConfigurationReaders/IConfigurationReader.cs b/src/FeatureFlagger.ConfigurationReaders/IConfigurationReader.cs
@@ -6,14  6,6 @@
 
     public interface IConfigurationReader
     {
-        /// <summary>
-        /// Read a feature from the configuration.
-        /// </summary>
-        /// <param name="featureName">The name of the feature.</param>
-        /// <param name="features">The list of features.</param>
-        /// <returns>A Feature.</returns>
-        Feature Read(string featureName, IEnumerable<Feature> features);
-
         /// <summary>
         /// Read the configuration.
         /// </summary>

diff --git a/src/FeatureFlagger.ConfigurationReaders/IReaderMetadata.cs b/src/FeatureFlagger.ConfigurationReaders/IReaderMetadata.cs
diff --git a/src/FeatureFlagger.ConfigurationReaders/ReaderMetadata.cs b/src/FeatureFlagger.ConfigurationReaders/ReaderMetadata.cs
@@ -0,0  1,7 @@
 namespace FeatureFlagger.ConfigurationReaders
 {
     public class ReaderMetadata
     {
         public string Reader { get; }
     }
 }
diff --git a/src/FeatureFlagger.ConfigurationReaders/StoreReader.cs b/src/FeatureFlagger.ConfigurationReaders/StoreReader.cs
@@ -1,6  1,5 @@
 namespace FeatureFlagger.ConfigurationReaders
 {
-    using System;
     using System.Collections.Generic;
     using System.Composition;
     using System.Configuration;
@@ -13,18  12,6 @@ namespace FeatureFlagger.ConfigurationReaders
         ExportMetadata(Constants.Reader, Constants.Store)]
     public class StoreReader : IConfigurationReader
     {
-        // NOTE: this method is the same for ConfigReader.
-        public Feature Read(string featureName, IEnumerable<Feature> features)
-        {
-            return
-                features.ToList()
-                    .Find(
-                        f =>
-                        f.Name.Equals(
-                            featureName,
-                            StringComparison.OrdinalIgnoreCase));
-        }
-
         public IEnumerable<Feature> ReadAll()
         {
             var connectionString = ConfigurationManager.ConnectionStrings["FeatureFlagger_DB"].ConnectionString;

diff --git a/src/FeatureFlagger.ConfigurationWriters/Constants.cs b/src/FeatureFlagger.ConfigurationWriters/Constants.cs
@@ -2,7  2,7 @@ namespace FeatureFlagger.ConfigurationWriters
 {
     public static class Constants
     {
-        public const string Writer = "WRITER";
         public const string Writer = "Writer";
         public const string Store  = "STORE";
     }
 }
diff --git a/src/FeatureFlagger.ConfigurationWriters/IWriterMetadata.cs b/src/FeatureFlagger.ConfigurationWriters/IWriterMetadata.cs
diff --git a/src/FeatureFlagger.ConfigurationWriters/StoreWriter.cs b/src/FeatureFlagger.ConfigurationWriters/StoreWriter.cs
@@ -13,7  13,8 @@ public class StoreWriter : IConfigurationWriter
     {
         private readonly string connectionString;
 
-        private StoreWriter()
         [ImportingConstructor]
         public StoreWriter()
         {
             this.connectionString = ConfigurationManager.ConnectionStrings["FeatureFlagger_DB"].ConnectionString;
         }

diff --git a/src/FeatureFlagger.ConfigurationWriters/WriterMetadata.cs b/src/FeatureFlagger.ConfigurationWriters/WriterMetadata.cs
@@ -0,0  1,7 @@
 namespace FeatureFlagger.ConfigurationReaders
 {
     public class WriterMetadata
     {
         public string Writer { get; }
     }
 }
diff --git a/src/FeatureFlagger/FeatureFlagExtensions.cs b/src/FeatureFlagger/FeatureFlagExtensions.cs
@@ -1,9  1,10 @@
 namespace FeatureFlagger
 {
     using System;
     using System.Collections.Generic;
     using System.Linq;
 
-    using Flag = Domain.Flag;
     using global::FeatureFlagger.Domain;
 
     public static class FeatureFlaggerExtensions
     {
@@ -30,7  31,7 @@ private static IEnumerable<Flag> GetFlags(IFeatureFlagger featureFlagger)
                 featureFlagger.GetType().Name
                     .Replace("FeatureFlagger", string.Empty);
 
-            var feature = FeatureFlagger.Reader.Read(featureName, FeatureFlagger.Features);
             var feature = Read(featureName);
 
             // add the feature name to each flag as a property
             // (as long as it's not been added already).
@@ -45,5  46,16 @@ private static IEnumerable<Flag> GetFlags(IFeatureFlagger featureFlagger)
 
             return feature.Flags;
         }
 
         private static Feature Read(string featureName)
         {
             return
                 FeatureFlagger.Features.ToList()
                     .Find(
                         f =>
                         f.Name.Equals(
                             featureName,
                             StringComparison.OrdinalIgnoreCase));
         }
     }
 }
diff --git a/src/FeatureFlagger/FeatureFlagger.cs b/src/FeatureFlagger/FeatureFlagger.cs
@@ -22,45  22,43 @@ static FeatureFlagger()
         private FeatureFlagger()
         {
             SetImports();
-            SetReader();
-            SetFeatures();
-            SetWriter();
             Reader = SetReader();
             Writer = SetWriter();
             Features = Reader.ReadAll();
         }
 
         [ImportMany]
         public static IEnumerable<IBehaviour> Behaviours { get; private set; }
 
         [ImportMany]
-        private static IEnumerable<Lazy<IConfigurationReader, IReaderMetadata>> Readers { get; set; }
         private static IEnumerable<Lazy<IConfigurationReader, ReaderMetadata>> Readers { get; set; }
 
         [ImportMany]
-        private static IEnumerable<Lazy<IConfigurationWriter, IWriterMetadata>> Writers { get; set; }
         private static IEnumerable<Lazy<IConfigurationWriter, WriterMetadata>> Writers { get; set; }
 
         public static IEnumerable<Feature> Features { get; private set; }
 
         public static IConfigurationReader Reader { get; private set; }
 
         public static IConfigurationWriter Writer { get; private set; }
 
-        public static void SetFeatures()
-        {
-            Features = Reader.ReadAll();
-        }
-
         private static IConfigurationReader SetReader()
         {
             // set the configuation reader based on an AppSetting.
             var source =
                 ConfigurationManager.AppSettings["FeatureFlaggerSource"]
                 ?? Constants.Config;
 
-            return Readers.ToList()
             var reader =
                 Readers.ToList()
                 .Find(
                     f =>
                     f.Metadata.Reader.Equals(
                         source,
                         StringComparison.OrdinalIgnoreCase))
                     .Value;
 
             return reader;
         }
 
         private static IConfigurationWriter SetWriter()
@@ -70,13  68,16 @@ private static IConfigurationWriter SetWriter()
                 ConfigurationManager.AppSettings["FeatureFlaggerSource"]
                 ?? Constants.Config;
 
-            return Writers.ToList()
             var writer =
                 Writers.ToList()
                 .Find(
                     f =>
                     f.Metadata.Writer.Equals(
                         source,
                         StringComparison.OrdinalIgnoreCase))
                     .Value;
 
             return writer;
         }
 
         private void SetImports()