Rework core namespace layout

ethanhann · ethanhann · commit 2982de8efeca · 2017-12-06T08:16:17.000-05:00
diff --git a/src/InEngine.Core/InEngine.Core.csproj b/src/InEngine.Core/InEngine.Core.csproj
@@ -26,7 +26,6 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />
     <PackageReference Include="StackExchange.Redis" Version="1.2.4" />
     <PackageReference Include="Goblinfactory.Konsole" Version="3.1.0" />
-    <PackageReference Include="EntityFramework" Version="6.2.0" />
     <PackageReference Include="RestSharp" Version="106.1.0" />
     <PackageReference Include="MailKit" Version="1.22.0" />
     <PackageReference Include="Serialize.Linq" Version="1.4.0" />
@@ -35,6 +34,8 @@
     <Folder Include="Scheduling\" />
     <Folder Include="Queuing\Clients\" />
     <Folder Include="Scheduling\Commands\" />
+    <Folder Include="Queuing\LifeCycle\" />
+    <Folder Include="Queuing\Message\" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.ComponentModel.DataAnnotations" />
diff --git a/src/InEngine.Core/Queuing/Clients/FileClient.cs b/src/InEngine.Core/Queuing/Clients/FileClient.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using System.Linq;
 using InEngine.Core.Exceptions;
-using Quartz;
+using InEngine.Core.Queuing.Message;
 
 namespace InEngine.Core.Queuing.Clients
 {
diff --git a/src/InEngine.Core/Queuing/Clients/RedisClient.cs b/src/InEngine.Core/Queuing/Clients/RedisClient.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using InEngine.Core.Exceptions;
-using InEngine.Core.IO;
+using InEngine.Core.Queuing.Message;
 using StackExchange.Redis;
 
 namespace InEngine.Core.Queuing.Clients
diff --git a/src/InEngine.Core/Queuing/Clients/SyncClient.cs b/src/InEngine.Core/Queuing/Clients/SyncClient.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
+using InEngine.Core.Queuing.Message;
 
 namespace InEngine.Core.Queuing.Clients
 {
diff --git a/src/InEngine.Core/Queuing/Commands/Consume.cs b/src/InEngine.Core/Queuing/Commands/Consume.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Threading;
 using CommandLine;
+using InEngine.Core.Queuing.Message;
 
 namespace InEngine.Core.Queuing.Commands
 {
diff --git a/src/InEngine.Core/Queuing/Commands/Peek.cs b/src/InEngine.Core/Queuing/Commands/Peek.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using CommandLine;
 using InEngine.Core.Exceptions;
+using InEngine.Core.Queuing.Message;
 using Konsole.Forms;
 
 namespace InEngine.Core.Queuing.Commands
diff --git a/src/InEngine.Core/Queuing/Enqueue.cs b/src/InEngine.Core/Queuing/Enqueue.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using InEngine.Core.Commands;
+using InEngine.Core.Queuing.LifeCycle;
 using Serialize.Linq.Extensions;
 
 namespace InEngine.Core.Queuing
diff --git a/src/InEngine.Core/Queuing/IQueueClient.cs b/src/InEngine.Core/Queuing/IQueueClient.cs
@@ -1,4 +1,5 @@
 ﻿using System.Collections.Generic;
+using InEngine.Core.Queuing.Message;
 
 namespace InEngine.Core.Queuing
 {
diff --git a/src/InEngine.Core/Queuing/LifeCycle/IQueueLifeCycleActions.cs b/src/InEngine.Core/Queuing/LifeCycle/IQueueLifeCycleActions.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace InEngine.Core.Queuing
+namespace InEngine.Core.Queuing.LifeCycle
 {
     public interface IQueueLifeCycleActions : IDispatch
     {
diff --git a/src/InEngine.Core/Queuing/LifeCycle/QueueLifeCycleActions.cs b/src/InEngine.Core/Queuing/LifeCycle/QueueLifeCycleActions.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace InEngine.Core.Queuing
+namespace InEngine.Core.Queuing.LifeCycle
 {
     public class QueueLifeCycleActions : IQueueLifeCycleActions
     {
diff --git a/src/InEngine.Core/Queuing/Message/CommandEnvelope.cs b/src/InEngine.Core/Queuing/Message/CommandEnvelope.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace InEngine.Core.Queuing
+namespace InEngine.Core.Queuing.Message
 {
     public class CommandEnvelope : ICommandEnvelope
     {
diff --git a/src/InEngine.Core/Queuing/Message/CompressionExtensions.cs b/src/InEngine.Core/Queuing/Message/CompressionExtensions.cs
@@ -3,7 +3,7 @@
 using System.IO.Compression;
 using System.Text;
 
-namespace InEngine.Core
+namespace InEngine.Core.Queuing.Message
 {
     public static class CompressionExtensions
     {
diff --git a/src/InEngine.Core/Queuing/Message/ICommandEnvelope.cs b/src/InEngine.Core/Queuing/Message/ICommandEnvelope.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace InEngine.Core.Queuing
+namespace InEngine.Core.Queuing.Message
 {
     public interface ICommandEnvelope
     {
diff --git a/src/InEngine.Core/Queuing/Message/JsonExtensions.cs b/src/InEngine.Core/Queuing/Message/JsonExtensions.cs
@@ -1,6 +1,6 @@
 ﻿using Newtonsoft.Json;
 
-namespace InEngine.Core
+namespace InEngine.Core.Queuing.Message
 {
     static class JsonExtensions
     {
diff --git a/src/InEngine.Core/Queuing/QueueAdapter.cs b/src/InEngine.Core/Queuing/QueueAdapter.cs
@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using InEngine.Core.Exceptions;
 using InEngine.Core.Queuing.Clients;
-using Konsole.Forms;
-using Newtonsoft.Json;
-using Quartz;
+using InEngine.Core.Queuing.Message;
 
 namespace InEngine.Core.Queuing
 {
@@ -57,11 +55,7 @@ public static AbstractCommand ExtractCommandInstanceFromMessage(ICommandEnvelope
             var commandType = Type.GetType($"{commandEnvelope.CommandClassName}, {commandEnvelope.CommandAssemblyName}");
             if (commandType == null)
                 throw new CommandFailedException($"Could not locate command {commandEnvelope.CommandClassName}. Is the {commandEnvelope.CommandAssemblyName} plugin registered in the settings file?");
-            return JsonConvert.DeserializeObject(
-                commandEnvelope.IsCompressed ? commandEnvelope.SerializedCommand.Decompress() : commandEnvelope.SerializedCommand,
-                commandType,
-                new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.Objects }
-            ) as AbstractCommand;
+            return commandEnvelope.SerializedCommand.DeserializeFromJson<AbstractCommand>(commandEnvelope.IsCompressed);
         }
 
         public long GetPendingQueueLength()

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.IO;`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using InEngine.Core.Exceptions;`
`6`		`-using Quartz;`
	`6`	`+using InEngine.Core.Queuing.Message;`
`7`	`7`
`8`	`8`	`namespace InEngine.Core.Queuing.Clients`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using InEngine.Core.Queuing.Message;`
`3`	`4`
`4`	`5`	`namespace InEngine.Core.Queuing.Clients`
`5`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Threading;`
`3`	`3`	`using CommandLine;`
	`4`	`+using InEngine.Core.Queuing.Message;`
`4`	`5`
`5`	`6`	`namespace InEngine.Core.Queuing.Commands`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.Collections.Generic;`
	`2`	`+using InEngine.Core.Queuing.Message;`
`2`	`3`
`3`	`4`	`namespace InEngine.Core.Queuing`
`4`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`
`3`		`-namespace InEngine.Core.Queuing`
	`3`	`+namespace InEngine.Core.Queuing.LifeCycle`
`4`	`4`	`{`
`5`	`5`	`public interface IQueueLifeCycleActions : IDispatch`
`6`	`6`	`{`