Refactoring of core #7 and configuration reader #11

warden-stack · Jul 31, 2016 · db504bc · db504bc
1 parent 3552ed5
commit db504bc
Show file tree

Hide file tree

Showing 14 changed files with 117 additions and 75 deletions.
diff --git a/src/Examples/Warden.Spawn.Examples.Console/Program.cs b/src/Examples/Warden.Spawn.Examples.Console/Program.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Warden.Spawn.Core;
@@ -11,22 +10,22 @@ public class Program
     {
         public static void Main(string[] args)
         {
-            var watcherConfigurationTypes = new Dictionary<string, Type>
+            var watcherConfigurations = new List<IConfigurationType>
             {
-                ["Web"] = typeof(WebWatcherSpawnConfiguration)
+                WebWatcherSpawnConfiguration.Type
             };
-            var integrationConfigurationTypes = new Dictionary<string, Type>();
-            var spawnConfigurationReader = new WardenSpawnJsonConfigurationReader(watcherConfigurationTypes,
-                integrationConfigurationTypes);
-            var configurationFile = File.ReadAllText("configuration.json");
-            var spawnConfiguration = spawnConfigurationReader.Read(configurationFile);
-            var extensions = new List<IExtension>
+            var configurationReader = new WardenSpawnJsonConfigurationReader(watcherConfigurations);
+            var configurationInput = File.ReadAllText("configuration.json");
+            var configuration = configurationReader.Read(configurationInput);
+
+            var watcherConfigurators = new List<IConfiguratorType>
             {
-                new Extension("Web", ExtensionType.Watcher, typeof(WebWatcherSpawnConfigurator))
+                WebWatcherSpawnConfigurator.Type
             };
-            var spawnConfigurator = new WardenSpawnConfigurator(extensions);
-            var spawn = spawnConfigurator.Configure(spawnConfiguration);
+            var configurator = new WardenSpawnConfigurator(watcherConfigurators);
+            var spawn = configurator.Configure(configuration);
             var warden = spawn.Spawn();
+
             System.Console.WriteLine($"Warden: '{warden.Name}' has been created and started monitoring.");
             Task.WaitAll(warden.StartAsync());
         }

diff --git a/src/Examples/Warden.Spawn.Examples.Console/configuration.json b/src/Examples/Warden.Spawn.Examples.Console/configuration.json
@@ -1,11 +1,29 @@
 {
   "wardenName": "Warden Spawn",
-  "watchers": [
-    {
+  "watchers": [{
       "type": "Web",
       "configuration": {
         "url": "http://www.google.com"
-      }  
+      },
+      "hooks": {
+        "name": "onCompletedAsync",
+        "actions": [
+          {
+            "type": "integration",
+            "integration": "sendGrid",
+            "checkResult": "invalid",
+            "action": {
+              "name": "sendEmailAsync",
+              "params": [
+                {
+                  "name": "message",
+                  "value": "Web watcher has returned invalid result."
+                }
+              ]
+            }
+          }
+        ]
+      }
     }
-  ]  
-}
+  ]
+}
diff --git a/src/Warden.Spawn/Core/ConfigurationType.cs b/src/Warden.Spawn/Core/ConfigurationType.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace Warden.Spawn.Core
+{
+    public class ConfigurationType : IConfigurationType
+    {
+        public Type Type { get; }
+        public string Name { get; }
+
+        public ConfigurationType(Type type, string name)
+        {
+            Type = type;
+            Name = name;
+        }
+    }
+}
diff --git a/src/Warden.Spawn/Core/ConfiguratorType.cs b/src/Warden.Spawn/Core/ConfiguratorType.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace Warden.Spawn.Core
+{
+    public class ConfiguratorType : IConfiguratorType
+    {
+        public Type Type { get; }
+        public string Name { get; }
+
+        public ConfiguratorType(Type type, string name)
+        {
+            Type = type;
+            Name = name;
+        }
+    }
+}
diff --git a/src/Warden.Spawn/Core/Extension.cs b/src/Warden.Spawn/Core/Extension.cs
diff --git a/src/Warden.Spawn/Core/ExtensionType.cs b/src/Warden.Spawn/Core/ExtensionType.cs
diff --git a/src/Warden.Spawn/Core/IConfigurationType.cs b/src/Warden.Spawn/Core/IConfigurationType.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Warden.Spawn.Core
+{
+    public interface IConfigurationType
+    {
+        Type Type { get; }
+        string Name { get; }
+    }
+}
diff --git a/src/Warden.Spawn/Core/IConfiguratorType.cs b/src/Warden.Spawn/Core/IConfiguratorType.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Warden.Spawn.Core
+{
+    public interface IConfiguratorType
+    {
+        Type Type { get; }
+        string Name { get; }
+    }
+}
diff --git a/src/Warden.Spawn/Core/IExtension.cs b/src/Warden.Spawn/Core/IExtension.cs
diff --git a/src/Warden.Spawn/Core/WardenSpawn.cs b/src/Warden.Spawn/Core/WardenSpawn.cs
@@ -15,7 +15,7 @@ public class WardenSpawn : IWardenSpawn
 
         public WardenSpawn(string wardenName, 
             IEnumerable<IWatcher> watchers, 
-            IEnumerable<IIntegration> integrations)
+            IEnumerable<IIntegration> integrations = null)
         {
             _wardenName = wardenName;
             _watchers = watchers ?? Enumerable.Empty<IWatcher>();

diff --git a/src/Warden.Spawn/Core/WardenSpawnConfigurator.cs b/src/Warden.Spawn/Core/WardenSpawnConfigurator.cs
@@ -2,40 +2,37 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Warden.Integrations;
 using Warden.Watchers;
 
 namespace Warden.Spawn.Core
 {
     public class WardenSpawnConfigurator : IWardenSpawnConfigurator
     {
-        private readonly IEnumerable<IExtension> _extensions;
+        private readonly IEnumerable<IConfiguratorType> _watcherConfiguratorTypes;
 
-        public WardenSpawnConfigurator(IEnumerable<IExtension> extensions)
+        public WardenSpawnConfigurator(IEnumerable<IConfiguratorType> watcherConfiguratorTypes)
         {
-            _extensions = extensions;
+            _watcherConfiguratorTypes = watcherConfiguratorTypes;
         }
 
         public IWardenSpawn Configure(IWardenSpawnConfiguration configuration)
         {
             var watchers = new List<IWatcher>();
-            var integrations = new List<IIntegration>();
             foreach (var watcherConfiguration in configuration.Watchers)
             {
-                var extension = _extensions.Where(x => x.Type == ExtensionType.Watcher)
-                    .FirstOrDefault(x => x.Name == watcherConfiguration.Name);
+                var extension = _watcherConfiguratorTypes.FirstOrDefault(x => x.Name.Equals(watcherConfiguration.Name));
                 if (extension == null)
                     continue;
 
-                var configurator = Activator.CreateInstance(extension.ConfiguratorType);
+                var configurator = Activator.CreateInstance(extension.Type);
                 var method = configurator.GetType()
                     .GetRuntimeMethods()
                     .First(x => x.Name.Equals("Configure"));
                 var watcher = method.Invoke(configurator, new object[] {watcherConfiguration}) as IWatcher;
                 watchers.Add(watcher);
             }
 
-            return new WardenSpawn(configuration.WardenName, watchers, integrations);
+            return new WardenSpawn(configuration.WardenName, watchers);
         }
     }
 }
diff --git a/src/Warden.Spawn/Core/WardenSpawnJsonConfigurationReader.cs b/src/Warden.Spawn/Core/WardenSpawnJsonConfigurationReader.cs
@@ -1,14 +1,15 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
 namespace Warden.Spawn.Core
 {
     public class WardenSpawnJsonConfigurationReader : IConfigurationReader<IWardenSpawnConfiguration>
     {
-        private readonly IDictionary<string, Type> _watcherConfigurationTypes;
-        private readonly IDictionary<string, Type> _integrationConfigurationTypes;
+        private readonly IEnumerable<IConfigurationType> _watcherConfigurationTypes;
+        private readonly IEnumerable<IConfigurationType> _integrationConfigurationTypes;
         private readonly JsonSerializerSettings _jsonSerializerSettings;
 
         private readonly JsonSerializerSettings _defaultJsonSerializerSettings = new JsonSerializerSettings
@@ -29,12 +30,12 @@ public class WardenSpawnJsonConfigurationReader : IConfigurationReader<IWardenSp
             }
         };
 
-        public WardenSpawnJsonConfigurationReader(IDictionary<string, Type> watcherConfigurationTypes,
-            IDictionary<string, Type> integrationConfigurationTypes,
+        public WardenSpawnJsonConfigurationReader(IEnumerable<IConfigurationType> watcherConfigurationTypes,
+            IEnumerable<IConfigurationType> integrationConfigurationTypes = null,
             JsonSerializerSettings jsonSerializerSettings = null)
         {
-            _watcherConfigurationTypes = watcherConfigurationTypes;
-            _integrationConfigurationTypes = integrationConfigurationTypes;
+            _watcherConfigurationTypes = watcherConfigurationTypes ?? Enumerable.Empty<IConfigurationType>();
+            _integrationConfigurationTypes = integrationConfigurationTypes ?? Enumerable.Empty<IConfigurationType>();
             _jsonSerializerSettings = jsonSerializerSettings ?? _defaultJsonSerializerSettings;
         }
 
@@ -56,9 +57,13 @@ private IEnumerable<IWatcherSpawnConfiguration> ResolveWatcherConfigurations(dyn
 
             foreach (var watcher in watchers)
             {
-                var watcherType = _watcherConfigurationTypes[watcher.type.ToString()];
+                var configuration = _watcherConfigurationTypes
+                    .FirstOrDefault(x => x.Name.Equals(watcher.type.ToString()));
+                if (configuration == null)
+                    continue;
+
                 var watcherConfigurationText = JsonConvert.SerializeObject(watcher.configuration);
-                var watcherConfiguration = JsonConvert.DeserializeObject(watcherConfigurationText, watcherType);
+                var watcherConfiguration = JsonConvert.DeserializeObject(watcherConfigurationText, configuration.Type);
 
                 yield return watcherConfiguration;
             }
@@ -72,9 +77,14 @@ private IEnumerable<IIntegrationSpawnConfiguration> ResolveIntegrationConfigurat
 
             foreach (var integration in integrations)
             {
-                var integrationType = _integrationConfigurationTypes[integration.type.ToString()];
+                var configuration = _integrationConfigurationTypes.FirstOrDefault(x =>
+                    x.Name.Equals(integration.type.ToString()));
+                if (configuration == null)
+                    continue;
+
                 var integrationConfigurationText = JsonConvert.SerializeObject(integration.configuration);
-                var integrationConfiguration = JsonConvert.DeserializeObject(integrationConfigurationText, integrationType);
+                var integrationConfiguration = JsonConvert.DeserializeObject(integrationConfigurationText,
+                    configuration.Type);
 
                 yield return integrationConfiguration;
             }

diff --git a/src/Watchers/Warden.Spawn.Watchers.Web/WebWatcherSpawnConfiguration.cs b/src/Watchers/Warden.Spawn.Watchers.Web/WebWatcherSpawnConfiguration.cs
@@ -6,6 +6,7 @@ namespace Warden.Spawn.Watchers.Web
     public class WebWatcherSpawnConfiguration : IWatcherSpawnConfiguration
     {
         public string Name => "Web";
+        public static IConfigurationType Type => new ConfigurationType(typeof(WebWatcherSpawnConfiguration), "Web");
         public string Url { get; protected set; }
 
         protected WebWatcherSpawnConfiguration()

diff --git a/src/Watchers/Warden.Spawn.Watchers.Web/WebWatcherSpawnConfigurator.cs b/src/Watchers/Warden.Spawn.Watchers.Web/WebWatcherSpawnConfigurator.cs
@@ -6,6 +6,8 @@ namespace Warden.Spawn.Watchers.Web
 {
     public class WebWatcherSpawnConfigurator : IWatcherSpawnConfigurator<WebWatcherSpawnConfiguration>
     {
+        public static IConfiguratorType Type => new ConfiguratorType(typeof(WebWatcherSpawnConfigurator), "Web");
+
         public IWatcher Configure(WebWatcherSpawnConfiguration configuration)
         {
             var watcherConfiguration = WebWatcherConfiguration