WIP Begin adding support for integration points

ethanhann · ethanhann · commit d08269a3c50b · 2015-02-11T19:49:08.000-05:00
* Rework config files.
* Move MQ connection class to Core.
diff --git a/IntegrationEngine.ConsoleHost/IntegrationEngine.ConsoleHost.csproj b/IntegrationEngine.ConsoleHost/IntegrationEngine.ConsoleHost.csproj
@@ -21,8 +21,9 @@
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Externalconsole>true</Externalconsole>
     <PlatformTarget>x86</PlatformTarget>
+    <Externalconsole>true</Externalconsole>
+    <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <DebugType>full</DebugType>
diff --git a/IntegrationEngine.ConsoleHost/Program.cs b/IntegrationEngine.ConsoleHost/Program.cs
@@ -11,10 +11,6 @@ public class Program
         public static EngineHost EngineHosts { get; set; }
         public static void Main(string[] args)
         {
-            Start(args);
-            Console.WriteLine("Press any key to stop...");
-            Console.ReadLine();
-            Stop();
             if (!Environment.UserInteractive)
             {
                 // Set current working directory as services use the system directory by default.
diff --git a/IntegrationEngine.Core/Configuration/ElasticsearchConfiguration.cs b/IntegrationEngine.Core/Configuration/ElasticsearchConfiguration.cs
@@ -3,6 +3,7 @@ namespace IntegrationEngine.Core.Configuration
 {
     public class ElasticsearchConfiguration : IElasticsearchConfiguration
     {
+        public string IntegrationPointName { get; set; }
         public string Protocol { get; set; }
         public string HostName { get; set; }
         public int Port { get; set; }
diff --git a/IntegrationEngine.Core/Configuration/IElasticsearchConfiguration.cs b/IntegrationEngine.Core/Configuration/IElasticsearchConfiguration.cs
@@ -2,7 +2,7 @@
 
 namespace IntegrationEngine.Core.Configuration
 {
-    public interface IElasticsearchConfiguration
+    public interface IElasticsearchConfiguration : IIntegrationPointConfiguration
     {
         string Protocol { get; set; }
         string HostName { get; set; }
diff --git a/IntegrationEngine.Core/Configuration/IEngineConfiguration.cs b/IntegrationEngine.Core/Configuration/IEngineConfiguration.cs
@@ -6,12 +6,7 @@ namespace IntegrationEngine.Core.Configuration
     public interface IEngineConfiguration
     {
         WebApiConfiguration WebApi { get; set; }
-        RabbitMQConfiguration MessageQueue { get; set; }
-        ElasticsearchConfiguration Elasticsearch { get; set; }
         NLogAdapterConfiguration NLogAdapter { get; set; }
-//        IList<IntegrationPointConfigurations> IntegrationPoints { get; set; }
         IntegrationPointConfigurations IntegrationPoints { get; set; }
-//        IList<string> MailConfigurations { get; set; }
-//        IMailConfiguration GetMailConfigurationByName(string integrationPointName);
     }
 }
diff --git a/IntegrationEngine.Core/Configuration/IRabbitMQConfiguration.cs b/IntegrationEngine.Core/Configuration/IRabbitMQConfiguration.cs
@@ -2,7 +2,7 @@
 
 namespace IntegrationEngine.Core.Configuration
 {
-    public interface IRabbitMQConfiguration
+    public interface IRabbitMQConfiguration : IIntegrationPointConfiguration
     {
         string QueueName { get; set; }
         string ExchangeName { get; set; }
diff --git a/IntegrationEngine.Core/Configuration/IntegrationPointConfigurations.cs b/IntegrationEngine.Core/Configuration/IntegrationPointConfigurations.cs
@@ -6,6 +6,8 @@ namespace IntegrationEngine.Core.Configuration
     public class IntegrationPointConfigurations
     {
         public IList<MailConfiguration> Mail { get; set; }
+        public IList<RabbitMQConfiguration> RabbitMQ { get; set; }
+        public IList<ElasticsearchConfiguration> Elasticsearch { get; set; }
     }
 }
 
diff --git a/IntegrationEngine.Core/Configuration/RabbitMQConfiguration.cs b/IntegrationEngine.Core/Configuration/RabbitMQConfiguration.cs
@@ -3,6 +3,7 @@ namespace IntegrationEngine.Core.Configuration
 {
     public class RabbitMQConfiguration : IRabbitMQConfiguration
     {
+        public string IntegrationPointName { get; set; }
         public string QueueName { get; set; }
         public string ExchangeName { get; set; }
         public string UserName { get; set; }
diff --git a/IntegrationEngine.Core/IntegrationEngine.Core.csproj b/IntegrationEngine.Core/IntegrationEngine.Core.csproj
@@ -124,6 +124,8 @@
     <Compile Include="Configuration\IRabbitMQConfiguration.cs" />
     <Compile Include="Configuration\IMySqlConfiguration.cs" />
     <Compile Include="Configuration\IntegrationPointConfigurations.cs" />
+    <Compile Include="R\IRScriptRunner.cs" />
+    <Compile Include="MessageQueue\MessageQueueConnection.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
diff --git a/IntegrationEngine.Core/MessageQueue/IMessageQueueConnection.cs b/IntegrationEngine.Core/MessageQueue/IMessageQueueConnection.cs
@@ -5,7 +5,7 @@ namespace IntegrationEngine.Core.MessageQueue
 {
     public interface IMessageQueueConnection
     {
-        RabbitMQConfiguration MessageQueueConfiguration { get; set; } 
+        IRabbitMQConfiguration MessageQueueConfiguration { get; set; } 
         ConnectionFactory GetConnectionFactory();
         IConnection GetConnection();
     }
diff --git a/IntegrationEngine.Core/MessageQueue/MessageQueueConnection.cs b/IntegrationEngine.Core/MessageQueue/MessageQueueConnection.cs
@@ -1,21 +1,20 @@
 ﻿using System;
 using RabbitMQ.Client;
 using IntegrationEngine.Core.Configuration;
-using IntegrationEngine.Core.MessageQueue;
 
-namespace IntegrationEngine.MessageQueue
+namespace IntegrationEngine.Core.MessageQueue
 {
     public class MessageQueueConnection : IMessageQueueConnection
     {
-        public RabbitMQConfiguration MessageQueueConfiguration { get; set; }
+        public IRabbitMQConfiguration MessageQueueConfiguration { get; set; }
         public ConnectionFactory ConnectionFactory { get; set; }
         IConnection _connection;
 
         public MessageQueueConnection()
         {
         }
 
-        public MessageQueueConnection(RabbitMQConfiguration messageQueueConfiguration)
+        public MessageQueueConnection(IRabbitMQConfiguration messageQueueConfiguration)
             : this()
         {
             MessageQueueConfiguration = messageQueueConfiguration;
diff --git a/IntegrationEngine.Core/MessageQueue/RabbitMQClient.cs b/IntegrationEngine.Core/MessageQueue/RabbitMQClient.cs
@@ -21,6 +21,12 @@ public RabbitMQClient()
             Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         }
 
+        public RabbitMQClient(RabbitMQConfiguration messageQueueConfiguration) : this()
+        {
+            MessageQueueConnection = new MessageQueueConnection(messageQueueConfiguration); 
+            MessageQueueConfiguration = messageQueueConfiguration;
+        }
+
         public void Publish(byte[] message)
         {
             using (var connection = MessageQueueConnection.GetConnection())
diff --git a/IntegrationEngine.Core/R/IRScriptRunner.cs b/IntegrationEngine.Core/R/IRScriptRunner.cs
@@ -0,0 +1,15 @@
+﻿using System;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using Nest;
+using IntegrationEngine.Core.Reports;
+
+namespace IntegrationEngine.Core.R
+{
+    public interface IRScriptRunner
+    {
+        IElasticClient ElasticClient { get; set; }
+        void Run<T>(IReport<T> report);
+    }
+}
+
diff --git a/IntegrationEngine.Core/R/RScriptRunner.cs b/IntegrationEngine.Core/R/RScriptRunner.cs
@@ -6,7 +6,7 @@
 
 namespace IntegrationEngine.Core.R
 {
-    public class RScriptRunner
+    public class RScriptRunner : IRScriptRunner
     {
         public IElasticClient ElasticClient { get; set; }
 
diff --git a/IntegrationEngine.Core/Storage/ElasticsearchRepository.cs b/IntegrationEngine.Core/Storage/ElasticsearchRepository.cs
@@ -19,6 +19,11 @@ public ElasticsearchRepository()
             Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         }
 
+        public ElasticsearchRepository(IElasticClient elasticClient) : this()
+        {
+            ElasticClient = elasticClient;
+        }
+
         public IEnumerable<TItem> SelectAll<TItem>() where TItem : class, IHasStringId
         {
             var response = ElasticClient.Search<TItem>(x => x);
diff --git a/IntegrationEngine.Tests/EngineHostCompositionRootTest.cs b/IntegrationEngine.Tests/EngineHostCompositionRootTest.cs
@@ -46,27 +46,6 @@ public void ShouldSetupLogging()
             Assert.That(Subject.Log.GetType(), Is.EqualTo(typeof(Common.Logging.NLog.NLogLogger)));
         }
 
-        [Test]
-        public void ShouldSetupElasticClient()
-        {
-            Subject.LoadConfiguration();
-
-            Subject.SetupElasticClient();
-
-            Subject.Container.Resolve<IElasticClient>();
-        }
-
-        [Test]
-        public void ShouldSetupElasticsearchRepository()
-        {
-            Subject.LoadConfiguration();
-            var mockElasticClient = new Mock<IElasticClient>();
-
-            Subject.SetupElasticsearchRepository(mockElasticClient.Object);
-
-            Subject.Container.Resolve<IElasticsearchRepository>();
-        }
-
         [Test]
         public void ShouldSetupMessageQueueListener()
         {
@@ -77,29 +56,6 @@ public void ShouldSetupMessageQueueListener()
             Subject.Container.Resolve<IThreadedListenerManager>();
         }
 
-        [Test]
-        public void ShouldSetupMessageQueueClient()
-        {
-            Subject.LoadConfiguration();
-
-            Subject.SetupMessageQueueClient();
-
-            Subject.Container.Resolve<IMessageQueueClient>();
-        }
-
-        [Test]
-        public void ShouldSetupEngineScheduler()
-        {
-            Subject.IntegrationJobTypes = new List<Type>();
-            Subject.LoadConfiguration();
-            var mockElasticsearchRespository= new Mock<IElasticsearchRepository>();
-            var mockDispatcher = new Mock<IDispatcher>();
-
-            Subject.SetupEngineScheduler(mockDispatcher.Object, mockElasticsearchRespository.Object);
-
-            Subject.Container.Resolve<IEngineScheduler>();
-        }
-
         [Test]
         public void ShouldSetupRScriptRunner()
         {
diff --git a/IntegrationEngine.userprefs b/IntegrationEngine.userprefs
@@ -1,12 +1,26 @@
 ﻿<Properties StartupItem="IntegrationEngine.ConsoleHost/IntegrationEngine.ConsoleHost.csproj">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="../../../../Library/Frameworks/Mono.framework/Versions/3.12.0/lib/mono/4.5/Microsoft.Common.targets">
+  <MonoDevelop.Ide.Workbench ActiveDocument="IntegrationEngine/EngineHostCompositionRoot.cs">
     <Files>
-      <File FileName="IntegrationEngine/MessageQueue/MsmqListener.cs" Line="1" Column="1" />
-      <File FileName="IntegrationEngine/MessageQueue/RabbitMQListener.cs" Line="19" Column="19" />
-      <File FileName="IntegrationEngine/EngineHostConfiguration.cs" Line="22" Column="22" />
+      <File FileName="IntegrationEngine.ConsoleHost/Program.cs" Line="10" Column="10" />
+      <File FileName="IntegrationEngine/EngineHostCompositionRoot.cs" Line="15" Column="15" />
       <File FileName="../../../../Library/Frameworks/Mono.framework/Versions/3.12.0/lib/mono/4.5/Microsoft.Common.targets" Line="1" Column="1" />
     </Files>
+    <Pads>
+      <Pad Id="MonoDevelop.NUnit.TestPad">
+        <State expanded="True">
+          <Node name="IntegrationEngine.Tests" expanded="True">
+            <Node name="IntegrationEngine" expanded="True">
+              <Node name="Tests" expanded="True">
+                <Node name="EngineHostCompositionRootTest" expanded="True">
+                  <Node name="ShouldSetupMessageQueueListener" selected="True" />
+                </Node>
+              </Node>
+            </Node>
+          </Node>
+        </State>
+      </Pad>
+    </Pads>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     <BreakpointStore />
diff --git a/IntegrationEngine/EngineConfiguration.cs b/IntegrationEngine/EngineConfiguration.cs
@@ -12,8 +12,6 @@ public EngineConfiguration() : base("IntegrationEngine.json")
         {}
 
         public WebApiConfiguration WebApi { get; set; }
-        public RabbitMQConfiguration MessageQueue { get; set; }
-        public ElasticsearchConfiguration Elasticsearch { get; set; }
         public NLogAdapterConfiguration NLogAdapter { get; set; }
         public IntegrationPointConfigurations IntegrationPoints { get; set; }
     }
diff --git a/IntegrationEngine/EngineHostCompositionRoot.cs b/IntegrationEngine/EngineHostCompositionRoot.cs
diff --git a/IntegrationEngine/IntegrationEngine.csproj b/IntegrationEngine/IntegrationEngine.csproj
diff --git a/IntegrationEngine/MessageQueue/RabbitMQListener.cs b/IntegrationEngine/MessageQueue/RabbitMQListener.cs
diff --git a/configuration/IntegrationEngine.json b/configuration/IntegrationEngine.json

Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,6 @@ public class Program`
`11`	`11`	`public static EngineHost EngineHosts { get; set; }`
`12`	`12`	`public static void Main(string[] args)`
`13`	`13`	`{`
`14`		`- Start(args);`
`15`		`- Console.WriteLine("Press any key to stop...");`
`16`		`- Console.ReadLine();`
`17`		`- Stop();`
`18`	`14`	`if (!Environment.UserInteractive)`
`19`	`15`	`{`
`20`	`16`	`// Set current working directory as services use the system directory by default.`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ namespace IntegrationEngine.Core.Configuration`
`3`	`3`	`{`
`4`	`4`	`public class ElasticsearchConfiguration : IElasticsearchConfiguration`
`5`	`5`	`{`
	`6`	`+ public string IntegrationPointName { get; set; }`
`6`	`7`	`public string Protocol { get; set; }`
`7`	`8`	`public string HostName { get; set; }`
`8`	`9`	`public int Port { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace IntegrationEngine.Core.Configuration`
`4`	`4`	`{`
`5`		`- public interface IElasticsearchConfiguration`
	`5`	`+ public interface IElasticsearchConfiguration : IIntegrationPointConfiguration`
`6`	`6`	`{`
`7`	`7`	`string Protocol { get; set; }`
`8`	`8`	`string HostName { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,7 @@ namespace IntegrationEngine.Core.Configuration`
`6`	`6`	`public interface IEngineConfiguration`
`7`	`7`	`{`
`8`	`8`	`WebApiConfiguration WebApi { get; set; }`
`9`		`- RabbitMQConfiguration MessageQueue { get; set; }`
`10`		`- ElasticsearchConfiguration Elasticsearch { get; set; }`
`11`	`9`	`NLogAdapterConfiguration NLogAdapter { get; set; }`
`12`		`-// IList<IntegrationPointConfigurations> IntegrationPoints { get; set; }`
`13`	`10`	`IntegrationPointConfigurations IntegrationPoints { get; set; }`
`14`		`-// IList<string> MailConfigurations { get; set; }`
`15`		`-// IMailConfiguration GetMailConfigurationByName(string integrationPointName);`
`16`	`11`	`}`
`17`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace IntegrationEngine.Core.Configuration`
`4`	`4`	`{`
`5`		`- public interface IRabbitMQConfiguration`
	`5`	`+ public interface IRabbitMQConfiguration : IIntegrationPointConfiguration`
`6`	`6`	`{`
`7`	`7`	`string QueueName { get; set; }`
`8`	`8`	`string ExchangeName { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ namespace IntegrationEngine.Core.Configuration`
`6`	`6`	`public class IntegrationPointConfigurations`
`7`	`7`	`{`
`8`	`8`	`public IList<MailConfiguration> Mail { get; set; }`
	`9`	`+ public IList<RabbitMQConfiguration> RabbitMQ { get; set; }`
	`10`	`+ public IList<ElasticsearchConfiguration> Elasticsearch { get; set; }`
`9`	`11`	`}`
`10`	`12`	`}`
`11`	`13`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ namespace IntegrationEngine.Core.Configuration`
`3`	`3`	`{`
`4`	`4`	`public class RabbitMQConfiguration : IRabbitMQConfiguration`
`5`	`5`	`{`
	`6`	`+ public string IntegrationPointName { get; set; }`
`6`	`7`	`public string QueueName { get; set; }`
`7`	`8`	`public string ExchangeName { get; set; }`
`8`	`9`	`public string UserName { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace IntegrationEngine.Core.MessageQueue`
`5`	`5`	`{`
`6`	`6`	`public interface IMessageQueueConnection`
`7`	`7`	`{`
`8`		`- RabbitMQConfiguration MessageQueueConfiguration { get; set; }`
	`8`	`+ IRabbitMQConfiguration MessageQueueConfiguration { get; set; }`
`9`	`9`	`ConnectionFactory GetConnectionFactory();`
`10`	`10`	`IConnection GetConnection();`
`11`	`11`	`}`