Small extension methods code cleanup

Author: Anton Vorontsov

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

@@ -39,22 +39,8 @@ public static IServiceCollection AddRabbitMqClient(this IServiceCollection servi
         public static IServiceCollection AddRabbitMqClient(this IServiceCollection services, RabbitMqClientOptions configuration)
         {
             services.AddRabbitMqClientInfrastructure();
+            services.ConfigureRabbitMqClientOptions(configuration);
             services.AddSingleton<IQueueService, QueueService>();
-            services.Configure<RabbitMqClientOptions>(opt =>
-            {
-                opt.HostName = configuration.HostName;
-                opt.HostNames = configuration.HostNames;
-                opt.TcpEndpoints = configuration.TcpEndpoints;
-                opt.Port = configuration.Port;
-                opt.UserName = configuration.UserName;
-                opt.Password = configuration.Password;
-                opt.VirtualHost = configuration.VirtualHost;
-                opt.AutomaticRecoveryEnabled = configuration.AutomaticRecoveryEnabled;
-                opt.TopologyRecoveryEnabled = configuration.TopologyRecoveryEnabled;
-                opt.RequestedConnectionTimeout = configuration.RequestedConnectionTimeout;
-                opt.RequestedHeartbeat = configuration.RequestedHeartbeat;
-                opt.ClientProvidedName = configuration.ClientProvidedName;
-            });
             return services;
         }
 
@@ -70,8 +56,8 @@ public static IServiceCollection AddRabbitMqClient(this IServiceCollection servi
         public static IServiceCollection AddRabbitMqClientTransient(this IServiceCollection services, IConfiguration configuration)
         {
             services.AddRabbitMqClientInfrastructure();
-            services.AddTransient<IQueueService, QueueService>();
             services.Configure<RabbitMqClientOptions>(configuration);
+            services.AddTransient<IQueueService, QueueService>();
             return services;
         }
 
@@ -87,7 +73,22 @@ public static IServiceCollection AddRabbitMqClientTransient(this IServiceCollect
         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;
@@ -105,14 +106,5 @@ public static IServiceCollection AddRabbitMqClientTransient(this IServiceCollect
             });
             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;
-        }
     }
 }