Attempt with custom MetadataAttribute

Unsettling · Aug 29, 2019 · a1b726d · a1b726d
1 parent f527f5e
commit a1b726d
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 39 deletions.
diff --git a/src/FeatureFlagger.ConfigurationReaders/ConfigReader.cs b/src/FeatureFlagger.ConfigurationReaders/ConfigReader.cs
@@ -1,13  1,11 @@
 namespace FeatureFlagger.ConfigurationReaders
 {
     using System.Collections.Generic;
-    using System.Composition;
     using System.Configuration;
 
     using FeatureFlagger.Domain;
 
-    [Export(typeof(IConfigurationReader)),
-        ExportMetadata(Constants.Reader, Constants.Config)]
     [ExportReader(Reader = Constants.Config)]
     public class ConfigReader : IConfigurationReader
     {
         public IEnumerable<Feature> ReadAll()

diff --git a/src/FeatureFlagger.ConfigurationReaders/Constants.cs b/src/FeatureFlagger.ConfigurationReaders/Constants.cs
@@ -3,7  3,6 @@ namespace FeatureFlagger.ConfigurationReaders
     public static class Constants
     {
         public const string Config = "CONFIG";
-        public const string Reader = "Reader";
         public const string Store  = "STORE";
     }
 }
diff --git a/src/FeatureFlagger.ConfigurationReaders/ExportReaderAttribute.cs b/src/FeatureFlagger.ConfigurationReaders/ExportReaderAttribute.cs
@@ -0,0  1,12 @@
 namespace FeatureFlagger.ConfigurationReaders
 {
     using System;
     using System.Composition;
 
     [MetadataAttribute]
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
     public class ExportReaderAttribute : ExportAttribute
     {
         public string Reader { get; set; }
     }
 }
diff --git a/src/FeatureFlagger.ConfigurationReaders/ReaderMetadata.cs b/src/FeatureFlagger.ConfigurationReaders/ReaderMetadata.cs
diff --git a/src/FeatureFlagger.ConfigurationReaders/StoreReader.cs b/src/FeatureFlagger.ConfigurationReaders/StoreReader.cs
@@ -1,15  1,13 @@
 namespace FeatureFlagger.ConfigurationReaders
 {
     using System.Collections.Generic;
-    using System.Composition;
     using System.Configuration;
     using System.Data.SqlClient;
     using System.Linq;
 
     using FeatureFlagger.Domain;
 
-    [Export(typeof(IConfigurationReader)),
-        ExportMetadata(Constants.Reader, Constants.Store)]
     [ExportReader(Reader = Constants.Store)]
     public class StoreReader : IConfigurationReader
     {
         public IEnumerable<Feature> ReadAll()

diff --git a/src/FeatureFlagger.ConfigurationWriters/Constants.cs b/src/FeatureFlagger.ConfigurationWriters/Constants.cs
@@ -2,7  2,6 @@ namespace FeatureFlagger.ConfigurationWriters
 {
     public static class Constants
     {
-        public const string Writer = "Writer";
         public const string Store  = "STORE";
     }
 }
diff --git a/src/FeatureFlagger.ConfigurationWriters/ExportWriterAttribute.cs b/src/FeatureFlagger.ConfigurationWriters/ExportWriterAttribute.cs
@@ -0,0  1,12 @@
 namespace FeatureFlagger.ConfigurationWriters
 {
     using System;
     using System.Composition;
 
     [MetadataAttribute]
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
     public class ExportWriterAttribute : ExportAttribute
     {
         public string Writer { get; set; }
     }
 }
diff --git a/src/FeatureFlagger.ConfigurationWriters/StoreWriter.cs b/src/FeatureFlagger.ConfigurationWriters/StoreWriter.cs
@@ -7,8  7,7 @@
 
     using Feature = Domain.Feature;
 
-    [Export(typeof(IConfigurationWriter)),
-        ExportMetadata(Constants.Writer, Constants.Store)]
     [ExportWriter(Writer = Constants.Store)]
     public class StoreWriter : IConfigurationWriter
     {
         private readonly string connectionString;

diff --git a/src/FeatureFlagger.ConfigurationWriters/WriterMetadata.cs b/src/FeatureFlagger.ConfigurationWriters/WriterMetadata.cs
diff --git a/src/FeatureFlagger/FeatureFlagExtensions.cs b/src/FeatureFlagger/FeatureFlagExtensions.cs
@@ -1,6  1,5 @@
 namespace FeatureFlagger
 {
-    using System;
     using System.Collections.Generic;
     using System.Linq;
 
@@ -31,7  30,7 @@ private static IEnumerable<Flag> GetFlags(IFeatureFlagger featureFlagger)
                 featureFlagger.GetType().Name
                     .Replace("FeatureFlagger", string.Empty);
 
-            var feature = Read(featureName);
             var feature = Helpers.Read(featureName);
 
             // add the feature name to each flag as a property
             // (as long as it's not been added already).
@@ -46,16  45,5 @@ 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
@@ -31,10  31,10 @@ private FeatureFlagger()
         public static IEnumerable<IBehaviour> Behaviours { get; private set; }
 
         [ImportMany]
-        private static IEnumerable<Lazy<IConfigurationReader, ReaderMetadata>> Readers { get; set; }
         private static IEnumerable<ExportFactory<IConfigurationReader, ExportReaderAttribute>> Readers { get; set; }
 
         [ImportMany]
-        private static IEnumerable<Lazy<IConfigurationWriter, WriterMetadata>> Writers { get; set; }
         private static IEnumerable<ExportFactory<IConfigurationWriter, ExportWriterAttribute>> Writers { get; set; }
 
         public static IEnumerable<Feature> Features { get; private set; }
 
@@ -49,13  49,16 @@ private static IConfigurationReader SetReader()
                 ConfigurationManager.AppSettings["FeatureFlaggerSource"]
                 ?? Constants.Config;
 
             var readers = Readers.ToList();
 
             var reader =
                 Readers.ToList()
                 .Find(
                     f =>
                     f.Metadata.Reader.Equals(
                         source,
                         StringComparison.OrdinalIgnoreCase))
                     .CreateExport()
                     .Value;
 
             return reader;
@@ -75,6  78,7 @@ private static IConfigurationWriter SetWriter()
                     f.Metadata.Writer.Equals(
                         source,
                         StringComparison.OrdinalIgnoreCase))
                     .CreateExport()
                     .Value;
 
             return writer;
@@ -91,6  95,7 @@ private void SetImports()
             var container = configuration.CreateContainer();
             container.SatisfyImports(this);
             Behaviours = container.GetExports<IBehaviour>();
             Readers = container.GetExports<ExportFactory<IConfigurationReader, ExportReaderAttribute>>();
         }
     }
 }
diff --git a/src/FeatureFlagger/Helpers.cs b/src/FeatureFlagger/Helpers.cs
@@ -0,0  1,19 @@
 namespace FeatureFlagger
 {
     using System;
     using System.Linq;
 
     public class Helpers
     {
         public static Domain.Feature Read(string featureName)
         {
             return
                 FeatureFlagger.Features.ToList()
                     .Find(
                         f =>
                         f.Name.Equals(
                             featureName,
                             StringComparison.OrdinalIgnoreCase));
         }
     }
 }