Fixed metadata

Unsettling · Aug 30, 2019 · adfca5c · adfca5c
1 parent a1b726d
commit adfca5c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/src/FeatureFlagger.Behaviours/FeatureFlagger.Behaviours.csproj b/src/FeatureFlagger.Behaviours/FeatureFlagger.Behaviours.csproj
@@ -4,6  4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.ComponentModel.Composition" Version="4.5.0" />
     <PackageReference Include="System.Composition.AttributedModel" Version="1.2.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
     <PackageReference Include="System.Data.SqlClient" Version="4.6.1" />

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

diff --git a/src/FeatureFlagger.ConfigurationReaders/StoreReader.cs b/src/FeatureFlagger.ConfigurationReaders/StoreReader.cs
@@ -1,13  1,15 @@
 namespace FeatureFlagger.ConfigurationReaders
 {
     using System.Collections.Generic;
     using System.Composition;
     using System.Configuration;
     using System.Data.SqlClient;
     using System.Linq;
 
     using FeatureFlagger.Domain;
 
-    [ExportReader(Reader = Constants.Store)]
     [Export(typeof(IConfigurationReader))]
     [ExportMetadata("Reader", Constants.Store)]
     public class StoreReader : IConfigurationReader
     {
         public IEnumerable<Feature> ReadAll()

diff --git a/src/FeatureFlagger.ConfigurationWriters/StoreWriter.cs b/src/FeatureFlagger.ConfigurationWriters/StoreWriter.cs
@@ -7,7  7,8 @@
 
     using Feature = Domain.Feature;
 
-    [ExportWriter(Writer = Constants.Store)]
     [Export(typeof(IConfigurationWriter))]
     [ExportMetadata("Writer", Constants.Store)]
     public class StoreWriter : IConfigurationWriter
     {
         private readonly string connectionString;

diff --git a/src/FeatureFlagger/FeatureFlagger.cs b/src/FeatureFlagger/FeatureFlagger.cs
@@ -71,7  71,7 @@ private static IConfigurationWriter SetWriter()
                 ConfigurationManager.AppSettings["FeatureFlaggerSource"]
                 ?? Constants.Config;
 
-            var writer =
             var writers =
                 Writers.ToList()
                 .Find(
                     f =>
@@ -81,7  81,7 @@ private static IConfigurationWriter SetWriter()
                     .CreateExport()
                     .Value;
 
-            return writer;
             return writers;
         }
 
         private void SetImports()
@@ -96,6  96,7 @@ private void SetImports()
             container.SatisfyImports(this);
             Behaviours = container.GetExports<IBehaviour>();
             Readers = container.GetExports<ExportFactory<IConfigurationReader, ExportReaderAttribute>>();
             Writers = container.GetExports<ExportFactory<IConfigurationWriter, ExportWriterAttribute>>();
         }
     }
 }