Remove Helpers and create Core namespace

Unsettling · Sep 2, 2019 · 7dcc693 · 7dcc693
1 parent 4975cf4
commit 7dcc693
Show file tree

Hide file tree

Showing 22 changed files with 57 additions and 36 deletions.
diff --git a/FeatureFlagger.sln b/FeatureFlagger.sln
@@ -11,7  11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FeatureFlagger", "src\FeatureFlagger\FeatureFlagger.csproj", "{9D15A2B6-FAEB-4A28-A25E-C58BCF327CC2}"
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FeatureFlagger.Core", "src\FeatureFlagger\FeatureFlagger.Core.csproj", "{9D15A2B6-FAEB-4A28-A25E-C58BCF327CC2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FeatureFlagger.Behaviours", "src\FeatureFlagger.Behaviours\FeatureFlagger.Behaviours.csproj", "{0F866C20-3765-41C8-9A10-BBE4F1F08AD4}"
 EndProject

diff --git a/examples/FeatureFlagger.Example.Console/ExampleFeatureFlag.cs b/examples/FeatureFlagger.Example.Console/ExampleFeatureFlag.cs
@@ -1,4  1,6 @@
-namespace FeatureFlagger.Example.Console
 using FeatureFlagger.Core;
 
 namespace FeatureFlagger.Example.Console
 {
     public class ExampleFeatureFlag : IFeatureFlagger
     {

diff --git a/examples/FeatureFlagger.Example.Console/FeatureFlagger.Examples.Console.csproj b/examples/FeatureFlagger.Example.Console/FeatureFlagger.Examples.Console.csproj
@@ -5,8  5,6 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\FeatureFlagger\FeatureFlagger.csproj">
-      <Private>true</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\FeatureFlagger\FeatureFlagger.Core.csproj" />
   </ItemGroup>
 </Project>
diff --git a/examples/FeatureFlagger.Example.Console/Program.cs b/examples/FeatureFlagger.Example.Console/Program.cs
@@ -1,4  1,6 @@
-namespace FeatureFlagger.Example.Console
 using FeatureFlagger.Core;
 
 namespace FeatureFlagger.Example.Console
 {
     public class Program
     {

diff --git a/src/FeatureFlagger.Authorisation/FeatureFlagger.Authorisation.csproj b/src/FeatureFlagger.Authorisation/FeatureFlagger.Authorisation.csproj
@@ -9,7  9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\FeatureFlagger\FeatureFlagger.csproj" />
     <ProjectReference Include="..\FeatureFlagger\FeatureFlagger.Core.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/FeatureFlagger.Authorisation/UserAuthorisationAttribute.cs b/src/FeatureFlagger.Authorisation/UserAuthorisationAttribute.cs
@@ -1,5  1,6 @@
 namespace FeatureFlagger.Authorisation
 {
     using FeatureFlagger.Core;
     using System;
     using System.Collections.Generic;
     using System.Linq;

diff --git a/src/FeatureFlagger.ConfigurationReaders/ConfigReader.cs b/src/FeatureFlagger.ConfigurationReaders/ConfigReader.cs
@@ -1,15  1,27 @@
 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("Reader", Constants.Config)]
     public class ConfigReader : IConfigurationReader
     {
         public Feature Read(string featureName, IEnumerable<Feature> features)
         {
             return
                 features.ToList()
                     .Find(
                         f =>
                         f.Name.Equals(
                             featureName,
                             StringComparison.OrdinalIgnoreCase));
         }
 
         public IEnumerable<Feature> ReadAll()
         {
             var features = (List<Feature>)ConfigurationManager.GetSection("features");

diff --git a/src/FeatureFlagger.ConfigurationReaders/IConfigurationReader.cs b/src/FeatureFlagger.ConfigurationReaders/IConfigurationReader.cs
@@ -6,6  6,8 @@
 
     public interface IConfigurationReader
     {
         Feature Read(string featureName, IEnumerable<Feature> features);
 
         /// <summary>
         /// Read the configuration.
         /// </summary>

diff --git a/src/FeatureFlagger.ConfigurationReaders/StoreReader.cs b/src/FeatureFlagger.ConfigurationReaders/StoreReader.cs
@@ -1,5  1,6 @@
 namespace FeatureFlagger.ConfigurationReaders
 {
     using System;
     using System.Collections.Generic;
     using System.Composition;
     using System.Configuration;
@@ -12,9  13,20 @@ namespace FeatureFlagger.ConfigurationReaders
     [ExportMetadata("Reader", Constants.Store)]
     public class StoreReader : IConfigurationReader
     {
         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;
             var connectionString = ConfigurationManager.ConnectionStrings["FeatureFlagger"].ConnectionString;
 
             const string QueryString =
                 "SELECT Features.Name, Flags.Name, FlagProperties.PropertyKey, FlagProperties.PropertyValue "

diff --git a/src/FeatureFlagger/Constants.cs b/src/FeatureFlagger/Constants.cs
@@ -1,9  1,9 @@
-namespace FeatureFlagger
 namespace FeatureFlagger.Core
 {
     public static class Constants
     {
-        public const string Config  = "CONFIG";
         public const string Config = "CONFIG";
         public const string Feature = "FEATURE";
-        public const string Store  = "STORE";
         public const string Store = "STORE";
     }
 }
diff --git a/src/FeatureFlagger/FeatureFlagExtensions.cs b/src/FeatureFlagger/FeatureFlagExtensions.cs
@@ -1,4  1,4 @@
-namespace FeatureFlagger
 namespace FeatureFlagger.Core
 {
     using System.Collections.Generic;
     using System.Linq;
@@ -30,7  30,7 @@ private static IEnumerable<Flag> GetFlags(IFeatureFlagger featureFlagger)
                 featureFlagger.GetType().Name
                     .Replace("FeatureFlagger", string.Empty);
 
-            var feature = Helpers.Read(featureName);
             var feature = FeatureFlagger.Reader.Read(featureName, FeatureFlagger.Features);
 
             // add the feature name to each flag as a property
             // (as long as it's not been added already).

diff --git a/src/FeatureFlagger/FeatureFlagger.csproj → ...FeatureFlagger/FeatureFlagger.Core.csproj b/src/FeatureFlagger/FeatureFlagger.csproj → ...FeatureFlagger/FeatureFlagger.Core.csproj
diff --git a/src/FeatureFlagger/FeatureFlagger.cs b/src/FeatureFlagger/FeatureFlagger.cs
@@ -1,4  1,4 @@
-namespace FeatureFlagger
 namespace FeatureFlagger.Core
 {
     using System;
     using System.Collections.Generic;

diff --git a/src/FeatureFlagger/Helpers.cs b/src/FeatureFlagger/Helpers.cs
diff --git a/src/FeatureFlagger/IFeatureFlag.cs b/src/FeatureFlagger/IFeatureFlag.cs
@@ -1,4  1,4 @@
-namespace FeatureFlagger
 namespace FeatureFlagger.Core
 {
     public interface IFeatureFlagger
     {

diff --git a/tests/FeatureFlagger.Tests/DisabledFeatureFlagger.cs b/tests/FeatureFlagger.Tests/DisabledFeatureFlagger.cs
@@ -1,5  1,7 @@
 namespace FeatureFlagger.Tests
 {
     using FeatureFlagger.Core;
 
     public class DisabledFeatureFlagger : IFeatureFlagger
     {
     }

diff --git a/tests/FeatureFlagger.Tests/ExampleFeatureFlagger.cs b/tests/FeatureFlagger.Tests/ExampleFeatureFlagger.cs
@@ -1,5  1,7 @@
 namespace FeatureFlagger.Tests
 {
     using FeatureFlagger.Core;
 
     public class ExampleFeatureFlagger : IFeatureFlagger
     {
     }

diff --git a/tests/FeatureFlagger.Tests/FeatureFlagger.Tests.csproj b/tests/FeatureFlagger.Tests/FeatureFlagger.Tests.csproj
@@ -24,6  24,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\FeatureFlagger.Authorisation\FeatureFlagger.Authorisation.csproj" />
     <ProjectReference Include="..\..\src\FeatureFlagger.ConfigurationReaders\FeatureFlagger.ConfigurationReaders.csproj" />
-    <ProjectReference Include="..\..\src\FeatureFlagger\FeatureFlagger.csproj" />
     <ProjectReference Include="..\..\src\FeatureFlagger\FeatureFlagger.Core.csproj" />
   </ItemGroup>
 </Project>
diff --git a/tests/FeatureFlagger.Tests/FeatureFlaggerTests.cs b/tests/FeatureFlagger.Tests/FeatureFlaggerTests.cs
@@ -1,5  1,6 @@
 namespace FeatureFlagger.Tests
 {
     using FeatureFlagger.Core;
     using Shouldly;
     using Xunit;
 

diff --git a/tests/FeatureFlagger.Tests/FromFeatureFlagger.cs b/tests/FeatureFlagger.Tests/FromFeatureFlagger.cs
@@ -1,5  1,7 @@
 namespace FeatureFlagger.Tests
 {
     using FeatureFlagger.Core;
 
     public class FromFeatureFlagger : IFeatureFlagger
     {
     }

diff --git a/tests/FeatureFlagger.Tests/UnuserFeatureFlagger.cs b/tests/FeatureFlagger.Tests/UnuserFeatureFlagger.cs
@@ -1,5  1,7 @@
 namespace FeatureFlagger.Tests
 {
     using FeatureFlagger.Core;
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Unuser", Justification = "No, really")]
     public class UnuserFeatureFlagger : IFeatureFlagger
     {

diff --git a/tests/FeatureFlagger.Tests/UserFeatureFlagger.cs b/tests/FeatureFlagger.Tests/UserFeatureFlagger.cs
@@ -1,5  1,7 @@
 namespace FeatureFlagger.Tests
 {
     using FeatureFlagger.Core;
 
     public class UserFeatureFlagger : IFeatureFlagger
     {
     }