Merge pull request #21 from AntonyVorontsov/feature/transient-queue-service

Feature/transient queue service

Author: antonyvorontsov

docs/changelog.md

@@ -10,6 +10,7 @@ All notable changes to this library will be documented in this file.
 - Extension methods which allow user to set the exact exchange from which messages will be processed by message handlers.
 - `MessageHandlingService` which is responsible for message processing.
 - `WildcardExtensions` and `MessageHandlingService` unit tests.
+- `AddRabbitMqClientTransient` extension methods.
 
 ## [2.2.1] copy of [3.1.0] - 2019-12-06
 

docs/message-production.md

@@ -18,7 +18,7 @@ public class HomeController : Controller
 }
 ```
 
-Or you can get the instance of singleton `IQueueService` in a console application.
+Or you can get the instance of `IQueueService` in a console application.
 
 ```c#
 public static class Program

docs/rabbit-configuration.md

@@ -24,6 +24,8 @@ public class Startup
 }
 ```
 
+The `AddRabbitMqClient` method will add an `IQueueService` as a **singleton**, but you can register it in the **transient** mode simply calling the `AddRabbitMqClientTransient` method which takes the same set of parameters. 
+
 A RabbitMQ client can be configured via a configuration section located in the `appsettings.json` file. This configuration section must be of a certain format and down below is an example of all configuration options used in `IQueueService`.
 
 ```json
@@ -141,4 +143,6 @@ public class Startup
 }
 ```
 
+There is also the `AddRabbitMqClientTransient` method which takes `RabbitMqClientOptions`.
+
 For the exchange configuration see the [Next page](exchange-configuration.md)

readme.md

@@ -26,7 +26,7 @@ public void ConfigureServices(IServiceCollection services)
 }
 ```
 
-By calling `AddRabbitMqClient` you add a singleton `IQueueService` that provides functionality of sending messages to queues. `AddProductionExchange` configures exchange to queues bindings (presented in json configuration) that allow messages to route properly. 
+By calling `AddRabbitMqClient` you add `IQueueService` that provides functionality of sending messages to queues. `AddProductionExchange` configures exchange to queues bindings (presented in json configuration) that allow messages to route properly. 
 Example of `appsettings.json` is two sections below. You can also configure everything manually. For more information, see [rabbit-configuration](./docs/rabbit-configuration.md) and [exchange-configuration](./docs/exchange-configuration.md) documentation files.
 
 Now you can inject an instance of `IQueueService` inside anything you want.

src/RabbitMQ.Client.Core.DependencyInjection/RabbitMqClientDependencyInjectionExtensions.cs

@@ -13,29 +13,82 @@ public static class RabbitMqClientDependencyInjectionExtensions
         /// <summary>
         /// Add RabbitMQ client and required service infrastructure.
         /// </summary>
+        /// <remarks>
+        /// QueueService will be added in the singleton mode.
+        /// </remarks>
         /// <param name="services">Service collection.</param>
         /// <param name="configuration">RabbitMq configuration section.</param>
         /// <returns>Service collection.</returns>
         public static IServiceCollection AddRabbitMqClient(this IServiceCollection services, IConfiguration configuration)
         {
-            services.AddOptions();
-            services.AddLogging(options => options.AddConsole());
+            services.AddRabbitMqClientInfrastructure();
             services.Configure<RabbitMqClientOptions>(configuration);
-            services.AddSingleton<IMessageHandlerContainerBuilder, MessageHandlerContainerBuilder>();
-            services.AddSingleton<IMessageHandlingService, MessageHandlingService>();
             services.AddSingleton<IQueueService, QueueService>();
             return services;
         }
 
         /// <summary>
         /// Add RabbitMQ client and required service infrastructure.
         /// </summary>
+        /// <remarks>
+        /// QueueService will be added in the singleton mode.
+        /// </remarks>
         /// <param name="services">Service collection.</param>
         /// <param name="configuration">RabbitMq configuration <see cref="RabbitMqClientOptions"/>.</param>
         /// <returns>Service collection.</returns>
         public static IServiceCollection AddRabbitMqClient(this IServiceCollection services, RabbitMqClientOptions configuration)
         {
+            services.AddRabbitMqClientInfrastructure();
+            services.ConfigureRabbitMqClientOptions(configuration);
+            services.AddSingleton<IQueueService, QueueService>();
+            return services;
+        }
+        
+        /// <summary>
+        /// Add RabbitMQ client and required service infrastructure.
+        /// </summary>
+        /// <remarks>
+        /// QueueService will be added in the transient mode.
+        /// </remarks>
+        /// <param name="services">Service collection.</param>
+        /// <param name="configuration">RabbitMq configuration section.</param>
+        /// <returns>Service collection.</returns>
+        public static IServiceCollection AddRabbitMqClientTransient(this IServiceCollection services, IConfiguration configuration)
+        {
+            services.AddRabbitMqClientInfrastructure();
+            services.Configure<RabbitMqClientOptions>(configuration);
+            services.AddTransient<IQueueService, QueueService>();
+            return services;
+        }
+        
+        /// <summary>
+        /// Add RabbitMQ client and required service infrastructure.
+        /// </summary>
+        /// <remarks>
+        /// QueueService will be added in the transient mode.
+        /// </remarks>
+        /// <param name="services">Service collection.</param>
+        /// <param name="configuration">RabbitMq configuration <see cref="RabbitMqClientOptions"/>.</param>
+        /// <returns>Service collection.</returns>
+        public static IServiceCollection AddRabbitMqClientTransient(this IServiceCollection services, RabbitMqClientOptions configuration)
+        {
+            services.AddRabbitMqClientInfrastructure();
+            services.ConfigureRabbitMqClientOptions(configuration);
+            services.AddTransient<IQueueService, QueueService>();
+            return services;
+        }
+
+        static IServiceCollection AddRabbitMqClientInfrastructure(this IServiceCollection services)
+        {
+            services.AddOptions();
             services.AddLogging(options => options.AddConsole());
+            services.AddSingleton<IMessageHandlerContainerBuilder, MessageHandlerContainerBuilder>();
+            services.AddSingleton<IMessageHandlingService, MessageHandlingService>();
+            return services;
+        }
+
+        static IServiceCollection ConfigureRabbitMqClientOptions(this IServiceCollection services, RabbitMqClientOptions configuration)
+        {
             services.Configure<RabbitMqClientOptions>(opt =>
             {
                 opt.HostName = configuration.HostName;
@@ -51,7 +104,6 @@ public static IServiceCollection AddRabbitMqClient(this IServiceCollection servi
                 opt.RequestedHeartbeat = configuration.RequestedHeartbeat;
                 opt.ClientProvidedName = configuration.ClientProvidedName;
             });
-            services.AddSingleton<IQueueService, QueueService>();
             return services;
         }
     }