Refactor config

Author: ethanhann

IntegrationEngine.ConsoleHost/IntegrationPoints/BarSqlServer.cs

@@ -1,5 +1,4 @@
 using System;
-using IntegrationEngine.Core.Points;
 
 namespace IntegrationEngine.ConsoleHost.IntegrationPoints
 {

IntegrationEngine.ConsoleHost/IntegrationPoints/FooMailClient.cs

@@ -1,5 +1,4 @@
 using System;
-using IntegrationEngine.Core.Points;
 using IntegrationEngine.Core.Mail;
 
 namespace IntegrationEngine.ConsoleHost.IntegrationPoints

IntegrationEngine.ConsoleHost/Program.cs

@@ -11,6 +11,10 @@ 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.

IntegrationEngine.Core.Tests/IntegrationEngine.Core.Tests.csproj

@@ -30,10 +30,6 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="RabbitMQ.Client, Version=3.4.3.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RabbitMQ.Client.3.4.3\lib\net35\RabbitMQ.Client.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
@@ -59,6 +55,9 @@
     <Reference Include="Common.Logging">
       <HintPath>..\packages\Common.Logging.3.0.0\lib\net40\Common.Logging.dll</HintPath>
     </Reference>
+    <Reference Include="RabbitMQ.Client">
+      <HintPath>..\packages\RabbitMQ.Client.3.4.3\lib\net35\RabbitMQ.Client.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MessageQueue\RabbitMQClientTest.cs" />

IntegrationEngine.Core.Tests/MessageQueue/RabbitMQClientTest.cs

@@ -4,11 +4,9 @@
 using IntegrationEngine.Core.MessageQueue;
 using Moq;
 using NUnit.Framework;
-using System;
 using RabbitMQ.Client;
+using System;
 using System.Text;
-using IntegrationEngine.Core.MessageQueue;
-using IntegrationEngine.Core.Configuration;
 
 namespace IntegrationEngine.Core.Tests.MessageQueue
 {

IntegrationEngine.Core/App.config

@@ -21,12 +21,4 @@
       <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
     </DbProviderFactories>
   </system.data>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
 </configuration>

IntegrationEngine.Core/Configuration/ElasticsearchConfiguration.cs

@@ -1,8 +1,7 @@
-using IntegrationEngine.Core.Points;
-
+
 namespace IntegrationEngine.Core.Configuration
 {
-    public class ElasticsearchConfiguration : IElasticsearchPoint
+    public class ElasticsearchConfiguration : IElasticsearchConfiguration
     {
         public string Protocol { get; set; }
         public string HostName { get; set; }

…ngine.Core/Points/IElasticsearchPoint.cs …iguration/IElasticsearchConfiguration.csIntegrationEngine.Core/Points/IElasticsearchPoint.cs renamed to IntegrationEngine.Core/Configuration/IElasticsearchConfiguration.cs IntegrationEngine.Core/Points/IElasticsearchPoint.cs renamed to IntegrationEngine.Core/Configuration/IElasticsearchConfiguration.cs

@@ -1,8 +1,8 @@
 using System;
 
-namespace IntegrationEngine.Core.Points
+namespace IntegrationEngine.Core.Configuration
 {
-    public interface IElasticsearchPoint
+    public interface IElasticsearchConfiguration
     {
         string Protocol { get; set; }
         string HostName { get; set; }

IntegrationEngine.Core/Configuration/IEngineConfiguration.cs

@@ -0,0 +1,17 @@
+using IntegrationEngine.Core.Configuration;
+using System.Collections.Generic;
+
+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);
+    }
+}

IntegrationEngine.Core/Configuration/IIntegrationPointConfiguration.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace IntegrationEngine.Core.Configuration
+{
+    public interface IIntegrationPointConfiguration
+    {
+        string IntegrationPointName { get; set; }
+    }
+}