Small code clean-up

Author: antonyvorontsov

README.md

@@ -223,7 +223,7 @@ You can find example projects in the repository too.
     "Durable": true,
     "AutoDelete": false,
 	"DeadLetterExchange": "default.dlx.exchange",
-	"RequeueFailedMessages": true
+	"RequeueFailedMessages": true,
     "Queues": [
 	  {
         "Name": "myqueue",

src/Examples.ConsumerHost/ConsumingService.cs

@@ -7,7 +7,7 @@
 
 namespace Examples.ConsumerHost
 {
-    public class ConsumingService : IHostedService, IDisposable
+    public class ConsumingService : IHostedService
     {
         readonly IQueueService _queueService;
         readonly ILogger<ConsumingService> _logger;
@@ -32,7 +32,5 @@ public Task StopAsync(CancellationToken cancellationToken)
             _logger.LogInformation("Stopping consuming.");
             return Task.CompletedTask;
         }
-
-        public void Dispose() => _queueService?.Dispose();
     }
 }

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

@@ -45,13 +45,7 @@ public static IServiceCollection AddExchange(this IServiceCollection services, s
 
             var options = new RabbitMqExchangeOptions();
             configuration.Bind(options);
-            var exchange = new RabbitMqExchange { Name = exchangeName, Options = options };
-            var service = new ExchangeServiceDescriptor(typeof(RabbitMqExchange), exchange)
-            {
-                ExchangeName = exchangeName
-            };
-            services.Add(service);
-            return services;
+            return services.AddExchange(exchangeName, options);
         }
 
         /// <summary>
@@ -61,7 +55,7 @@ public static IServiceCollection AddExchange(this IServiceCollection services, s
         /// <param name="exchangeName">Exchange name.</param>
         /// <param name="options">Exchange configuration <see cref="RabbitMqExchangeOptions"/>.</param>
         /// <returns>Service collection.</returns>
-        public static IServiceCollection AddExchange(this IServiceCollection services, string exchangeName, RabbitMqExchangeOptions options = null)
+        public static IServiceCollection AddExchange(this IServiceCollection services, string exchangeName, RabbitMqExchangeOptions options)
         {
             var exchangeExists = services.Any(x => x.ServiceType == typeof(RabbitMqExchange)
                               && x.Lifetime == ServiceLifetime.Singleton