Use IIntegrationPoint to load integration points

Author: ethanhann

IntegrationEngine.Core/Configuration/IntegrationPointConfigurationAttribute.cs

@@ -1,19 +1,20 @@
 using System;
 using System.Collections.Generic;
+using System.Data.Entity.ModelConfiguration.Conventions;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace IntegrationEngine.Core.Configuration
 {
-    [AttributeUsage(AttributeTargets.Class)]
-    public class IntegrationPointConfigurationAttribute : Attribute
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface)]
+    public class IntegrationPointConfigurationByAttribute : Attribute
     {
-        public string Name { get; set; }
+        public IIntegrationPointConfiguration IntegrationPointConfiguration { get; set; }
 
-        //public IntegrationPointConfigurationAttribute(string name)
-        //{
-        //    Name = name;
-        //}
+        public IntegrationPointConfigurationByAttribute(IIntegrationPointConfiguration integrationPointConfiguration)
+        {
+            IntegrationPointConfiguration = integrationPointConfiguration;
+        }
     }
 }

IntegrationEngine.Core/Elasticsearch/ElasticClientAdapter.cs

@@ -0,0 +1,9 @@
+using Nest;
+using IntegrationEngine.Core.IntegrationPoint;
+using IntegrationEngine.Core.Configuration;
+
+namespace IntegrationEngine.Core.Elasticsearch
+{
+    public class ElasticClientAdapter : ElasticClient, IIntegrationPoint<IElasticsearchConfiguration>
+    {}
+}

IntegrationEngine.Core/IntegrationEngine.Core.csproj

@@ -83,8 +83,12 @@
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="Configuration\ElasticsearchConfiguration.cs" />
+    <Compile Include="Configuration\IntegrationPointConfigurationByAttribute.cs" />
     <Compile Include="Configuration\MailConfiguration.cs" />
     <Compile Include="Configuration\RabbitMQConfiguration.cs" />
+    <Compile Include="Elasticsearch\ElasticClientAdapter.cs" />
+    <Compile Include="IntegrationPoint\IIntegrationPointT.cs" />
+    <Compile Include="IntegrationPoint\IIntegrationPoint.cs" />
     <Compile Include="Jobs\IIntegrationJob.cs" />
     <Compile Include="Jobs\ILogJob.cs" />
     <Compile Include="Jobs\IMailJob.cs" />

IntegrationEngine.Core/IntegrationPoint/IIntegrationPoint.cs

@@ -0,0 +1,9 @@
+using System.Security.Cryptography.X509Certificates;
+using IntegrationEngine.Core.Configuration;
+
+namespace IntegrationEngine.Core.IntegrationPoint
+{
+    public interface IIntegrationPoint
+    {
+    }
+}

IntegrationEngine.Core/IntegrationPoint/IIntegrationPointT.cs

@@ -0,0 +1,10 @@
+using System.Security.Cryptography.X509Certificates;
+using IntegrationEngine.Core.Configuration;
+
+namespace IntegrationEngine.Core.IntegrationPoint
+{
+    public interface IIntegrationPoint<TConfiguration> : IIntegrationPoint
+        where TConfiguration : IIntegrationPointConfiguration
+    {
+    }
+}

IntegrationEngine.Core/Mail/IMailClient.cs

@@ -1,9 +1,10 @@
 using IntegrationEngine.Core.Configuration;
+using IntegrationEngine.Core.IntegrationPoint;
 using System.Net.Mail;
 
 namespace IntegrationEngine.Core.Mail
 {
-    public interface IMailClient
+    public interface IMailClient : IIntegrationPoint<IMailConfiguration>
     {
         ISmtpClient SmtpClient { get; set; }
         void Send(MailMessage mailMessage);

IntegrationEngine.Core/MessageQueue/IRabbitMQClient.cs

@@ -1,8 +1,8 @@
-using System;
-using System.Collections.Generic;
+using IntegrationEngine.Core.Configuration;
+using IntegrationEngine.Core.IntegrationPoint;
 
 namespace IntegrationEngine.Core.MessageQueue
 {
-    public interface IRabbitMQClient : IMessageQueueClient
+    public interface IRabbitMQClient : IMessageQueueClient, IIntegrationPoint<IMailConfiguration>
     {}
 }

IntegrationEngine/EngineHostCompositionRoot.cs

@@ -3,6 +3,8 @@
 using Common.Logging.NLog;
 using IntegrationEngine.Api;
 using IntegrationEngine.Core.Configuration;
+using IntegrationEngine.Core.Elasticsearch;
+using IntegrationEngine.Core.IntegrationPoint;
 using IntegrationEngine.Core.Jobs;
 using IntegrationEngine.Core.Mail;
 using IntegrationEngine.Core.MessageQueue;
@@ -110,7 +112,7 @@ public void RegisterIntegrationPoints()
                         config.IntegrationPointName
                     )
                 );
-                Container.RegisterType<IElasticClient, ElasticClient>(config.IntegrationPointName, 
+                Container.RegisterType<IElasticClient, ElasticClientAdapter>(config.IntegrationPointName, 
                     new InjectionFactory(elasticClientFactory));
             }
             foreach (var config in EngineConfiguration.IntegrationPoints.RabbitMQ) {
@@ -138,12 +140,12 @@ public void RegisterIntegrationJobs()
                     {
                         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))
-                            resolvedParameters.Add(Activator.CreateInstance(parameterType, Container.Resolve<IMailConfiguration>(parameterName)));
-                        if (typeof(IRabbitMQClient).IsAssignableFrom(parameterType))
-                            resolvedParameters.Add(Activator.CreateInstance(parameterType, Container.Resolve<IRabbitMQConfiguration>(parameterName)));
-                        if (typeof(IElasticClient).IsAssignableFrom(parameterType))
-                            resolvedParameters.Add(Activator.CreateInstance(parameterType, Container.Resolve<IElasticsearchConfiguration>(parameterName)));
+                        // If the parameter implements IIntegrationPoint, resolve it's configuration type from the container.
+                        if (typeof(IIntegrationPoint).IsAssignableFrom(parameterType))
+                        {
+                            var configType = parameterType.GetInterface(typeof(IIntegrationPoint<IIntegrationPointConfiguration>).Name).GetGenericArguments().Single(); ;
+                            resolvedParameters.Add(Activator.CreateInstance(parameterType, Container.Resolve(configType, parameterName)));
+                        }
                     }
                     return resolvedParameters.Cast<object>().ToArray();
                 };