Broken out RabbitMq into a separate project and nuget package.

Author: dennishog

.gitignore

@@ -9,3 +9,5 @@
 /DS.SimpleServiceBus.ConsoleApp/obj
 /DS.SimpleServiceBus.Tests/bin
 /DS.SimpleServiceBus.Tests/obj
+/DS.SimpleServiceBus.RabbitMq/bin/Release/netstandard2.0
+/DS.SimpleServiceBus.RabbitMq/obj

DS.SimpleServiceBus.ConsoleApp/DS.SimpleServiceBus.ConsoleApp.csproj

@@ -14,6 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\DS.SimpleServiceBus.RabbitMq\DS.SimpleServiceBus.RabbitMq.csproj" />
     <ProjectReference Include="..\DS.SimpleServiceBus\DS.SimpleServiceBus.csproj" />
   </ItemGroup>
 

DS.SimpleServiceBus.ConsoleApp/Events/TestEvent.cs

@@ -5,6 +5,5 @@ namespace DS.SimpleServiceBus.ConsoleApp.Events
 {
     public class TestEvent : Event<TestModel>
     {
-
     }
 }

DS.SimpleServiceBus.ConsoleApp/Events/TestEvent2.cs

@@ -5,6 +5,5 @@ namespace DS.SimpleServiceBus.ConsoleApp.Events
 {
     public class TestEvent2 : Event<TestModel>
     {
-        
     }
 }

DS.SimpleServiceBus.ConsoleApp/Program.cs

@@ -8,7 +8,7 @@
 using DS.SimpleServiceBus.ConsoleApp.Events.EventHandlers;
 using DS.SimpleServiceBus.ConsoleApp.Events.Models;
 using DS.SimpleServiceBus.Factories;
-using DS.SimpleServiceBus.Services;
+using DS.SimpleServiceBus.RabbitMq.Extensions;
 
 namespace DS.SimpleServiceBus.ConsoleApp
 {
@@ -23,30 +23,26 @@ public static async Task MainAsync()
         {
             Console.WriteLine("Hello World!");
 
-            var busService = BusServiceFactory.CreateUsingRabbitMq(cfg =>
+            var busService = BusServiceFactory.Create.UsingRabbitMq(cfg =>
             {
                 cfg.Uri = "rabbitmq://localhost/dsevents";
                 cfg.Username = "guest";
                 cfg.Password = "guest";
             });
 
-            //var busService = new BusService(cfg =>
-            //{
-            //    cfg.Uri = "rabbitmq://localhost/dsevents";
-            //    cfg.Username = "guest";
-            //    cfg.Password = "guest";
-            //});
-
             await busService.StartAsync(CancellationToken.None);
 
-            var eventService = new EventService(busService, cfg => cfg.EventQueueName = "ds.events");
+            var eventService =
+                EventServiceFactory.Create.UsingRabbitMq(busService, x => x.EventQueueName = "ds.events");
             eventService.RegisterEventHandler<TestEventListener>();
             eventService.RegisterEventHandler<TestEventListener2>();
 
-            var commandService = new CommandService(busService, cfg => cfg.CommandQueueName = "ds.commands");
+            var commandService =
+                CommandServiceFactory.Create.UsingRabbitMq(busService, x => x.CommandQueueName = "ds.command");
             commandService.RegisterCommandHandler<TestCommandHandler>();
 
-            var commandService2 = new CommandService(busService, cfg => cfg.CommandQueueName = "ds.commands2");
+            var commandService2 =
+                CommandServiceFactory.Create.UsingRabbitMq(busService, x => x.CommandQueueName = "ds.commands2");
             commandService2.RegisterCommandHandler<TestCommandHandler2>();
 
 
@@ -57,7 +53,7 @@ await eventService.PublishAsync(new TestEvent
 
             eventService.PublishAsync(new TestEvent2
             {
-                Model = new TestModel { Id = 10, Name = "Andreas" }
+                Model = new TestModel {Id = 10, Name = "Andreas"}
             }, CancellationToken.None).Wait();
 
             var request = new TestRequest {Id = 10};

DS.SimpleServiceBus/Commands/RequestResponseClient.cs DS.SimpleServiceBus.RabbitMq/Commands/RequestResponseClient.cs

@@ -3,7 +3,7 @@
 using DS.SimpleServiceBus.Commands.Interfaces;
 using MassTransit;
 
-namespace DS.SimpleServiceBus.Commands
+namespace DS.SimpleServiceBus.RabbitMq.Commands
 {
     public class RequestResponseClient : IRequestResponseClient
     {

DS.SimpleServiceBus/Configuration/Interfaces/IRabbitMqBusServiceConfiguration.cs DS.SimpleServiceBus.RabbitMq/Configuration/Interfaces/IRabbitMqBusServiceConfiguration.cs

@@ -1,4 +1,6 @@
-namespace DS.SimpleServiceBus.Configuration.Interfaces
+using DS.SimpleServiceBus.Configuration.Interfaces;
+
+namespace DS.SimpleServiceBus.RabbitMq.Configuration.Interfaces
 {
     public interface IRabbitMqBusServiceConfiguration : IBusServiceConfiguration
     {

DS.SimpleServiceBus.RabbitMq/Configuration/Interfaces/IRabbitMqCommandServiceConfiguration.cs

@@ -0,0 +1,8 @@
+using DS.SimpleServiceBus.Configuration.Interfaces;
+
+namespace DS.SimpleServiceBus.RabbitMq.Configuration.Interfaces
+{
+    public interface IRabbitMqCommandServiceConfiguration : ICommandServiceConfiguration
+    {
+    }
+}

DS.SimpleServiceBus.RabbitMq/Configuration/Interfaces/IRabbitMqEventServiceConfiguration.cs

@@ -0,0 +1,8 @@
+using DS.SimpleServiceBus.Configuration.Interfaces;
+
+namespace DS.SimpleServiceBus.RabbitMq.Configuration.Interfaces
+{
+    public interface IRabbitMqEventServiceConfiguration : IEventServiceConfiguration
+    {
+    }
+}

DS.SimpleServiceBus/Configuration/RabbitMQBusServiceConfiguration.cs DS.SimpleServiceBus.RabbitMq/Configuration/RabbitMQBusServiceConfiguration.cs

@@ -1,6 +1,6 @@
-using DS.SimpleServiceBus.Configuration.Interfaces;
+using DS.SimpleServiceBus.RabbitMq.Configuration.Interfaces;
 
-namespace DS.SimpleServiceBus.Configuration
+namespace DS.SimpleServiceBus.RabbitMq.Configuration
 {
     public class RabbitMqBusServiceConfiguration : IRabbitMqBusServiceConfiguration
     {

DS.SimpleServiceBus.RabbitMq/Configuration/RabbitMqCommandServiceConfiguration.cs

@@ -0,0 +1,18 @@
+using DS.SimpleServiceBus.RabbitMq.Configuration.Interfaces;
+
+namespace DS.SimpleServiceBus.RabbitMq.Configuration
+{
+    public class RabbitMqCommandServiceConfiguration : IRabbitMqCommandServiceConfiguration
+    {
+        public RabbitMqCommandServiceConfiguration()
+        {
+        }
+
+        public RabbitMqCommandServiceConfiguration(string commandQueueName)
+        {
+            CommandQueueName = commandQueueName;
+        }
+
+        public string CommandQueueName { get; set; }
+    }
+}

DS.SimpleServiceBus.RabbitMq/Configuration/RabbitMqEventServiceConfiguration.cs

@@ -0,0 +1,18 @@
+using DS.SimpleServiceBus.RabbitMq.Configuration.Interfaces;
+
+namespace DS.SimpleServiceBus.RabbitMq.Configuration
+{
+    public class RabbitMqEventServiceConfiguration : IRabbitMqEventServiceConfiguration
+    {
+        public RabbitMqEventServiceConfiguration()
+        {
+        }
+
+        public RabbitMqEventServiceConfiguration(string eventQueueName)
+        {
+            EventQueueName = eventQueueName;
+        }
+
+        public string EventQueueName { get; set; }
+    }
+}

DS.SimpleServiceBus.RabbitMq/DS.SimpleServiceBus.RabbitMq.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <Authors>Dennis Hogström</Authors>
+    <Company>Dennis Software</Company>
+    <PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/dennishog/SimpleServiceBus</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/dennishog/SimpleServiceBus</RepositoryUrl>
+    <Version>1.0.6</Version>
+    <AssemblyVersion>1.0.6.0</AssemblyVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MassTransit.RabbitMQ" Version="4.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DS.SimpleServiceBus\DS.SimpleServiceBus.csproj" />
+  </ItemGroup>
+
+</Project>

DS.SimpleServiceBus.RabbitMq/Extensions/BusServiceFactoryExtensions.cs

@@ -0,0 +1,33 @@
+using System;
+using DS.SimpleServiceBus.Factories.Interfaces;
+using DS.SimpleServiceBus.RabbitMq.Configuration;
+using DS.SimpleServiceBus.RabbitMq.Configuration.Interfaces;
+using DS.SimpleServiceBus.RabbitMq.Services;
+using DS.SimpleServiceBus.Services.Interfaces;
+using MassTransit;
+using MassTransit.RabbitMqTransport;
+
+namespace DS.SimpleServiceBus.RabbitMq.Extensions
+{
+    public static class BusServiceFactoryExtensions
+    {
+        public static IBusService UsingRabbitMq(this IBusServiceFactoryExtensionHook extensionHook,
+            Action<IRabbitMqBusServiceConfiguration> action)
+        {
+            IRabbitMqBusServiceConfiguration configuration = new RabbitMqBusServiceConfiguration();
+            action(configuration);
+
+            IRabbitMqHost host = null;
+            var bus = Bus.Factory.CreateUsingRabbitMq(cfg =>
+            {
+                host = cfg.Host(new Uri(configuration.Uri), h =>
+                {
+                    h.Username(configuration.Username);
+                    h.Password(configuration.Password);
+                });
+            });
+
+            return new RabbitMqBusService(bus, host);
+        }
+    }
+}

DS.SimpleServiceBus.RabbitMq/Extensions/CommandServiceFactoryExtensions.cs

@@ -0,0 +1,21 @@
+using System;
+using DS.SimpleServiceBus.Factories.Interfaces;
+using DS.SimpleServiceBus.RabbitMq.Configuration;
+using DS.SimpleServiceBus.RabbitMq.Configuration.Interfaces;
+using DS.SimpleServiceBus.RabbitMq.Services;
+using DS.SimpleServiceBus.Services.Interfaces;
+
+namespace DS.SimpleServiceBus.RabbitMq.Extensions
+{
+    public static class CommandServiceFactoryExtensions
+    {
+        public static ICommandService UsingRabbitMq(this ICommandServiceFactoryExtensionHook extensionHook,
+            IBusService busService, Action<IRabbitMqCommandServiceConfiguration> action)
+        {
+            IRabbitMqCommandServiceConfiguration configuration = new RabbitMqCommandServiceConfiguration();
+            action(configuration);
+
+            return new RabbitMqCommandService(busService, configuration);
+        }
+    }
+}

DS.SimpleServiceBus.RabbitMq/Extensions/EventServiceFactoryExtensions.cs

@@ -0,0 +1,21 @@
+using System;
+using DS.SimpleServiceBus.Factories.Interfaces;
+using DS.SimpleServiceBus.RabbitMq.Configuration;
+using DS.SimpleServiceBus.RabbitMq.Configuration.Interfaces;
+using DS.SimpleServiceBus.RabbitMq.Services;
+using DS.SimpleServiceBus.Services.Interfaces;
+
+namespace DS.SimpleServiceBus.RabbitMq.Extensions
+{
+    public static class EventServiceFactoryExtensions
+    {
+        public static IEventService UsingRabbitMq(this IEventServiceFactoryExtensionHook extensionHook,
+            IBusService busService, Action<IRabbitMqEventServiceConfiguration> action)
+        {
+            IRabbitMqEventServiceConfiguration configuration = new RabbitMqEventServiceConfiguration();
+            action(configuration);
+
+            return new RabbitMqEventService(busService, configuration);
+        }
+    }
+}

DS.SimpleServiceBus.RabbitMq/Services/Interfaces/IRabbitMqBusService.cs

@@ -0,0 +1,8 @@
+using DS.SimpleServiceBus.Services.Interfaces;
+
+namespace DS.SimpleServiceBus.RabbitMq.Services.Interfaces
+{
+    public interface IRabbitMqBusService : IBusService
+    {
+    }
+}

DS.SimpleServiceBus.RabbitMq/Services/Interfaces/IRabbitMqCommandService.cs

@@ -0,0 +1,9 @@
+using DS.SimpleServiceBus.Commands.Interfaces;
+using MassTransit;
+
+namespace DS.SimpleServiceBus.RabbitMq.Services.Interfaces
+{
+    public interface IRabbitMqCommandService : SimpleServiceBus.Services.Interfaces.ICommandService, IConsumer<ICommandMessage>
+    {
+    }
+}

DS.SimpleServiceBus/Configuration/Interfaces/IAzureServiceBusBusServiceConfiguration.cs DS.SimpleServiceBus.RabbitMq/Services/Interfaces/IRabbitMqEventService.cs

@@ -4,9 +4,9 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DS.SimpleServiceBus.Configuration.Interfaces
+namespace DS.SimpleServiceBus.RabbitMq.Services.Interfaces
 {
-    public interface IAzureServiceBusBusServiceConfiguration
+    public interface IRabbitMqEventService
     {
 
     }