Continue to flesh out integraion points

Author: ethanhann

IntegrationEngine.ConsoleHost/IntegrationJobs/CarReport/CarMailMessageJob.cs

@@ -1,4 +1,5 @@
-using IntegrationEngine.Core.Jobs;
+using IntegrationEngine.ConsoleHost.IntegrationPoints;
+using IntegrationEngine.Core.Jobs;
 using IntegrationEngine.Core.Mail;
 using System;
 using System.Collections.Generic;
@@ -11,6 +12,16 @@ public class CarMailMessageJob : IMailJob, IParameterizedJob
         public IMailClient MailClient { get; set; }
         public IDictionary<string, string> Parameters { get; set; }
 
+        public CarMailMessageJob()
+        {
+        }
+
+        public CarMailMessageJob(IFooMailClient mailClient)
+            : this()
+        {
+            MailClient = mailClient;
+        } 
+
         public void Run()
         {
             var mailMessage = new MailMessage();

IntegrationEngine.ConsoleHost/IntegrationPoints/FooMailClient.cs

@@ -1,9 +1,15 @@
 using System;
 using IntegrationEngine.Core.Mail;
+using IntegrationEngine.Core.Configuration;
 
 namespace IntegrationEngine.ConsoleHost.IntegrationPoints
 {
+    //[IntegrationPointConfiguration("FooMailClient")]
     public class FooMailClient : MailClient
-    {}
+    {
+        public FooMailClient(IMailConfiguration mailConfiguration)
+        {
+            MailConfiguration = mailConfiguration;
+        }
+    }
 }
-

IntegrationEngine.ConsoleHost/IntegrationPoints/IFooMailClient.cs

@@ -0,0 +1,11 @@
+using System;
+using IntegrationEngine.Core.Mail;
+using IntegrationEngine.Core.Configuration;
+
+namespace IntegrationEngine.ConsoleHost.IntegrationPoints
+{
+    //[IntegrationPointConfiguration("FooMailClient")]
+    public interface IFooMailClient : IMailClient
+    {
+    }
+}

IntegrationEngine.Core/Configuration/IntegrationPointConfigurationAttribute.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntegrationEngine.Core.Configuration
+{
+    [AttributeUsage(AttributeTargets.Class)]
+    public class IntegrationPointConfigurationAttribute : Attribute
+    {
+        public string Name { get; set; }
+
+        //public IntegrationPointConfigurationAttribute(string name)
+        //{
+        //    Name = name;
+        //}
+    }
+}

IntegrationEngine.Core/IntegrationEngine.Core.csproj

@@ -89,6 +89,7 @@
     <Compile Include="Jobs\ILogJob.cs" />
     <Compile Include="Jobs\IMailJob.cs" />
     <Compile Include="Jobs\IntegrationJobRunFailureException.cs" />
+    <Compile Include="Configuration\IntegrationPointConfigurationAttribute.cs" />
     <Compile Include="Jobs\IParameterizedJob.cs" />
     <Compile Include="Jobs\ISqlJob.cs" />
     <Compile Include="Jobs\SqlJob.cs" />

IntegrationEngine/EngineHostCompositionRoot.cs

@@ -42,10 +42,11 @@ public void Configure(IList<Assembly> assembliesWithJobs)
             LoadConfiguration();
             SetupLogging();
             RegisterIntegrationPoints();
+            RegisterIntegrationJobs();
             SetupRScriptRunner();
             SetupElasticsearchRepository();
-            SetupEngineScheduler();
             SetupThreadedListenerManager();
+            SetupEngineScheduler();
             SetupWebApi();
         }
 
@@ -76,10 +77,13 @@ public void RegisterIntegrationPoints()
             Container.RegisterType<INestSerializer, NestSerializer>();
             Container.RegisterType<Elasticsearch.Net.Connection.ITransport, Elasticsearch.Net.Connection.Transport>();
             Container.RegisterType<IConnectionSettingsValues, ConnectionSettings>();
+            //Container.RegisterType<IMailConfiguration, MailConfiguration>();
             foreach (var config in EngineConfiguration.IntegrationPoints.Mail) {
                 Container.RegisterInstance<IMailConfiguration>(config.IntegrationPointName, config);
                 Container.RegisterType<IMailClient, MailClient>(config.IntegrationPointName, new InjectionConstructor(config));
             }
+            var mailClientConfig = Container.Resolve<IMailConfiguration>("FooMailClient");
+            
             foreach (var config in EngineConfiguration.IntegrationPoints.Elasticsearch) {
                 Container.RegisterInstance<IElasticsearchConfiguration>(config.IntegrationPointName, config);
                 var serverUri = new UriBuilder(config.Protocol, config.HostName, config.Port).Uri;
@@ -100,6 +104,52 @@ public void RegisterIntegrationPoints()
             }
         }
 
+        public void RegisterIntegrationJobs()
+        {
+            foreach (var jobType in IntegrationJobTypes)
+            {
+                // Register the Types with the Container
+                // Register a constructor with the Container
+                // Need to know which constructor should be used.
+                // If it has no constructor, assume default constructor
+                // If it has one constructor, then use that constructor
+                // If it has two or more constructors use the first one with arguments
+                var constructorCount = jobType.GetConstructors().Count();
+                if (constructorCount <= 1)
+                {
+                    Container.RegisterType(jobType);
+                    continue;
+                }
+                //else if (constructorCount >= 2)
+                //{
+                var parameters = jobType.GetConstructors().Single(x => x.GetParameters().Any()).GetParameters();
+                // Resolve the integration point type (in parameters).
+                // Configure the integration point type with a configuration, based on the parameter name.                    
+                var resolvedParameters = new List<ResolvedParameter>();
+                foreach (var parameterInfo in parameters)
+                {
+                    var parameterType = parameterInfo.ParameterType;              // The type of integration point (e.g. IElasticClient)
+                    var parameterName = parameterInfo.ParameterType.Name;         // The name of the configuration endpoint (e.g. "MyElasticClient")
+
+                    if (typeof(IMailClient).IsAssignableFrom(parameterType))
+                    {
+                        // Register the integration point.
+                        // To register the integration point, the parameters of the type's constructor must be known.
+                        // To make this happen, an integration point must have a constructor that takes a configuration object parameter.
+                        //var configName = parameterType.GetCustomAttribute<IntegrationPointConfigurationAttribute>().Name;
+                        //var config = Container.Resolve<IMailConfiguration>(parameterName);
+                        //Container.RegisterType(parameterType, new InjectionConstructor(config));
+
+                        //Container.RegisterType<IMailClient, MailClient>(config.IntegrationPointName, new InjectionConstructor(config));
+                        Container.RegisterType(parameterType, typeof(MailClient));
+                        resolvedParameters.Add(new ResolvedParameter(parameterType, parameterName));
+                    }
+                }
+                var objectArray = resolvedParameters.Cast<object>().ToArray();
+                Container.RegisterType(jobType, new InjectionConstructor(objectArray));
+            }
+        }
+
         public void SetupThreadedListenerManager()
         {
             var config = Container.Resolve<IRabbitMQConfiguration>("DefaultRabbitMQ");

IntegrationEngine/MessageQueue/RabbitMQListener.cs

@@ -11,11 +11,13 @@
 using RabbitMQ.Client.Events;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading;
+using Microsoft.Practices.Unity;
 
 namespace IntegrationEngine.MessageQueue
 {
@@ -63,8 +65,9 @@ public void Listen(CancellationToken cancellationToken)
                         if (IntegrationJobTypes != null && !IntegrationJobTypes.Any())
                             continue;
                         var type = IntegrationJobTypes.FirstOrDefault(t => t.FullName.Equals(message.JobType));
-                        var integrationJob = Activator.CreateInstance(type) as IIntegrationJob;
-                        //                        integrationJob = AutoWireJob(integrationJob, type);
+                        //var integrationJob = Activator.CreateInstance(type) as IIntegrationJob;
+                        //integrationJob = AutoWireJob(integrationJob, type);
+                        var integrationJob = ContainerSingleton.GetContainer().Resolve(type) as IIntegrationJob;
                         if (integrationJob != null)
                         {
                             if (integrationJob is IParameterizedJob)

IntegrationEngine/Scheduler/IntegrationJobDispatcherJob.cs

@@ -16,12 +16,12 @@ public IntegrationJobDispatcherJob()
         public virtual void Execute(IJobExecutionContext context)
         {
             var map = context.MergedJobDataMap;
-            if (map.ContainsKey("MessageQueueClient") && 
+            if (map.ContainsKey("Dispatcher") && 
                 map.ContainsKey("IntegrationJob") && 
                 map.ContainsKey("Parameters"))
             {
-                var dispatcher = map.Get("Dispatcher") as IDispatcher;
                 var parameters = map.Get("Parameters") as IDictionary<string, string>;
+                var dispatcher = map.Get("Dispatcher") as IDispatcher;
                 dispatcher.Dispatch(map.Get("IntegrationJob"), parameters);
             }
         }

configuration/IntegrationEngine.json

@@ -13,6 +13,10 @@
             "IntegrationPointName": "DefaultMail",
             "HostName": "localhost",
             "Port": 25
+        }, {
+            "IntegrationPointName": "FooMailClient",
+            "HostName": "localhost",
+            "Port": 25
         }],
         "RabbitMQ": [{
             "IntegrationPointName": "DefaultRabbitMQ",