Refactor dependency injection

endjin · May 12, 2015 · 80f1283 · 80f1283
1 parent e57a533
commit 80f1283
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/...zure/Storage/CancellationTokenProvider.cs → ...reBlobStorageCancellationTokenProvider.cs b/...zure/Storage/CancellationTokenProvider.cs → ...reBlobStorageCancellationTokenProvider.cs
@@ -14,7 +14,7 @@
 
     #endregion
 
-    public class CancellationTokenProvider : ICancellationTokenProvider
+    public class AzureBlobStorageCancellationTokenProvider : ICancellationTokenProvider
     {
         private readonly IConnectionStringProvider connectionStringProvider;
 
@@ -23,7 +23,7 @@ public class CancellationTokenProvider : ICancellationTokenProvider
         private bool initialised;
         private CloudStorageAccount storageAccount;
 
-        public CancellationTokenProvider(IConnectionStringProvider connectionStringProvider)
+        public AzureBlobStorageCancellationTokenProvider(IConnectionStringProvider connectionStringProvider)
         {
             this.connectionStringProvider = connectionStringProvider;
         }

diff --git a/Solutions/Endjin.Cancelable.Azure.Storage/Endjin.Cancelable.Azure.Storage.csproj b/Solutions/Endjin.Cancelable.Azure.Storage/Endjin.Cancelable.Azure.Storage.csproj
@@ -69,7 +69,7 @@
     <Reference Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Cancelable\Azure\Storage\CancellationTokenProvider.cs" />
+    <Compile Include="Cancelable\Azure\Storage\AzureBlobStorageCancellationTokenProvider.cs" />
     <Compile Include="Cancelable\Azure\Storage\Configuration.cs" />
     <Compile Include="Contracts\IConnectionStringProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

diff --git a/Solutions/Endjin.Cancelable.Demo/Program.cs b/Solutions/Endjin.Cancelable.Demo/Program.cs
@@ -19,7 +19,7 @@ public static void Main(string[] args)
             Console.WriteLine("Ensure you are running the Azure Storage Emulator!");
             Console.ResetColor();
 
-            var cancelable = new Cancelable(new CancellationTokenProvider(new ConnectionStringProvider()), new CancellationTokenObserverFactory(new CancellationTokenProvider(new ConnectionStringProvider())));
+            var cancelable = new Cancelable(new AzureBlobStorageCancellationTokenProvider(new ConnectionStringProvider()));
             var cancellationToken = "E75FF4F5-755E-4FB9-ABE0-24BD81F4D045";
 
             cancelable.CreateTokenAsync(cancellationToken);

diff --git a/Solutions/Endjin.Cancelable.Specs/Steps/CancelableSteps.cs b/Solutions/Endjin.Cancelable.Specs/Steps/CancelableSteps.cs
@@ -21,7 +21,7 @@ public class CancelableSteps
         [Given(@"a cancelation token is issued")]
         public void GivenACancelationTokenIsIssued()
         {
-            var cancelable = new Cancelable(new CancellationTokenProvider(new ConnectionStringProvider()), new CancellationTokenObserverFactory(new CancellationTokenProvider(new ConnectionStringProvider())));
+            var cancelable = new Cancelable(new AzureBlobStorageCancellationTokenProvider(new ConnectionStringProvider()));
 
             string token = ScenarioContext.Current.Get<string>("CancellationToken");
             cancelable.CreateTokenAsync(token).Wait();
@@ -48,14 +48,14 @@ public void GivenTheTaskIsToldToCancelIfTheCancellationTokenIsIssued(string toke
         [Given(@"that a cancellation token '(.*)' is issued")]
         public void GivenThatACancellationTokenIsIssued(string token)
         {
-            var cancelable = new Cancelable(new CancellationTokenProvider(new ConnectionStringProvider()), new CancellationTokenObserverFactory(new CancellationTokenProvider(new ConnectionStringProvider())));
+            var cancelable = new Cancelable(new AzureBlobStorageCancellationTokenProvider(new ConnectionStringProvider()));
             cancelable.CreateTokenAsync(token).Wait();
         }
 
         [Given(@"the cancellation token '(.*)' is deleted")]
         public void GivenTheCancellationTokenIsDeleted(string token)
         {
-            var cancelable = new Cancelable(new CancellationTokenProvider(new ConnectionStringProvider()), new CancellationTokenObserverFactory(new CancellationTokenProvider(new ConnectionStringProvider())));
+            var cancelable = new Cancelable(new AzureBlobStorageCancellationTokenProvider(new ConnectionStringProvider()));
             cancelable.DeleteTokenAsync(token).Wait();
         }
 
@@ -77,7 +77,7 @@ public void ThenTheTaskShouldBeCancelled()
         [When(@"I execute the task")]
         public void WhenIExecuteTheTask()
         {
-            var cancelable = new Cancelable(new CancellationTokenProvider(new ConnectionStringProvider()), new CancellationTokenObserverFactory(new CancellationTokenProvider(new ConnectionStringProvider())));
+            var cancelable = new Cancelable(new AzureBlobStorageCancellationTokenProvider(new ConnectionStringProvider()));
             IPeriodicityStrategy periodicityStrategy;
 
             ScenarioContext.Current.TryGetValue("PeriodicityStrategy", out periodicityStrategy);

diff --git a/Solutions/Endjin.Cancelable/Cancelable/Cancelable.cs b/Solutions/Endjin.Cancelable/Cancelable/Cancelable.cs
@@ -16,10 +16,10 @@ public class Cancelable : ICancelable
         private readonly ICancellationTokenProvider cancellationTokenProvider;
         private readonly ICancellationTokenObserverFactory cancellationTokenObserverFactory;
 
-        public Cancelable(ICancellationTokenProvider cancellationTokenProvider, ICancellationTokenObserverFactory cancellationTokenObserverFactory)
+        public Cancelable(ICancellationTokenProvider cancellationTokenProvider)
         {
             this.cancellationTokenProvider = cancellationTokenProvider;
-            this.cancellationTokenObserverFactory = cancellationTokenObserverFactory;
+            this.cancellationTokenObserverFactory = new CancellationTokenObserverFactory(this.cancellationTokenProvider);
         }
 
         public async Task CreateTokenAsync(string cancellationToken)