Improve code-coverage by merging similar AddNLog-methods (#648)

NLog · Dec 13, 2022 · adc6f2d · adc6f2d
1 parent 6008c9c
commit adc6f2d
Showing 1 changed file with 9 additions and 22 deletions.
diff --git a/src/NLog.Extensions.Logging/Extensions/ConfigureExtensions.cs b/src/NLog.Extensions.Logging/Extensions/ConfigureExtensions.cs
@@ -71,20 +71,18 @@ public static ILoggerFactory AddNLog(this ILoggerFactory factory, IConfiguration
         /// <returns>ILoggingBuilder for chaining</returns>
         public static ILoggingBuilder AddNLog(this ILoggingBuilder builder)
         {
-            return builder.AddNLog((NLogProviderOptions)null);
+            return builder.AddNLog(NLogProviderOptions.Default);
         }
 
         /// <summary>
         /// Enable NLog as logging provider for Microsoft Extension Logging
         /// </summary>
-        /// <param name="factory"></param>
+        /// <param name="builder"></param>
         /// <param name="configuration">Override configuration and not use default Host Builder Configuration</param>
         /// <returns>ILoggingBuilder for chaining</returns>
-        public static ILoggingBuilder AddNLog(this ILoggingBuilder factory, IConfiguration configuration)
+        public static ILoggingBuilder AddNLog(this ILoggingBuilder builder, IConfiguration configuration)
         {
-            Guard.ThrowIfNull(factory);
-            AddNLogLoggerProvider(factory, configuration, null, CreateNLogLoggerProvider);
-            return factory;
+            return AddNLog(builder, configuration, null);
         }
 
         /// <summary>
@@ -169,36 +167,25 @@ public static ILoggingBuilder AddNLog(this ILoggingBuilder builder, string confi
         /// Enable NLog as logging provider for Microsoft Extension Logging
         /// </summary>
         /// <param name="builder"></param>
-        /// <param name="options">NLog Logging Provider options</param>
         /// <param name="factoryBuilder">Initialize NLog LogFactory with NLog LoggingConfiguration.</param>
         /// <returns>ILoggingBuilder for chaining</returns>
-        public static ILoggingBuilder AddNLog(this ILoggingBuilder builder, NLogProviderOptions options, Func<IServiceProvider, LogFactory> factoryBuilder)
+        public static ILoggingBuilder AddNLog(this ILoggingBuilder builder, Func<IServiceProvider, LogFactory> factoryBuilder)
         {
-            Guard.ThrowIfNull(builder);
-            Guard.ThrowIfNull(factoryBuilder);
-            AddNLogLoggerProvider(builder, null, options, (serviceProvider, config, options) =>
-            {
-                serviceProvider.SetupNLogConfigSettings(config, LogManager.LogFactory);
-
-                // Delay initialization of targets until we have loaded config-settings
-                var logFactory = factoryBuilder(serviceProvider);
-                var provider = CreateNLogLoggerProvider(serviceProvider, config, options, logFactory);
-                return provider;
-            });
-            return builder;
+            return AddNLog(builder, null, factoryBuilder);
         }
 
         /// <summary>
         /// Enable NLog as logging provider for Microsoft Extension Logging
         /// </summary>
         /// <param name="builder"></param>
+        /// <param name="options">NLog Logging Provider options</param>
         /// <param name="factoryBuilder">Initialize NLog LogFactory with NLog LoggingConfiguration.</param>
         /// <returns>ILoggingBuilder for chaining</returns>
-        public static ILoggingBuilder AddNLog(this ILoggingBuilder builder, Func<IServiceProvider, LogFactory> factoryBuilder)
+        public static ILoggingBuilder AddNLog(this ILoggingBuilder builder, NLogProviderOptions options, Func<IServiceProvider, LogFactory> factoryBuilder)
         {
             Guard.ThrowIfNull(builder);
             Guard.ThrowIfNull(factoryBuilder);
-            AddNLogLoggerProvider(builder, null, null, (serviceProvider, config, options) =>
+            AddNLogLoggerProvider(builder, null, options, (serviceProvider, config, options) =>
             {
                 serviceProvider.SetupNLogConfigSettings(config, LogManager.LogFactory);