refactor: code cleanup

Author: phnx47

src/ServiceCollectionExtensions.cs

@@ -1,31 +1,30 @@
 using Microsoft.Extensions.DependencyInjection;
 using Prometheus.Client.Collectors;
 
-namespace Prometheus.Client.DependencyInjection
+namespace Prometheus.Client.DependencyInjection;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    /// <summary>
+    ///     Add IMetricFactory and ICollectorRegistry into service collection
+    /// </summary>
+    /// <param name="services">Service collection</param>
+    public static IServiceCollection AddMetricFactory(this IServiceCollection services)
     {
-        /// <summary>
-        ///     Add IMetricFactory and ICollectorRegistry into service collection
-        /// </summary>
-        /// <param name="services">Service collection</param>
-        public static IServiceCollection AddMetricFactory(this IServiceCollection services)
-        {
-            services.AddSingleton<ICollectorRegistry, CollectorRegistry>();
-            services.AddSingleton<IMetricFactory, MetricFactory>();
-            return services;
-        }
+        services.AddSingleton<ICollectorRegistry, CollectorRegistry>();
+        services.AddSingleton<IMetricFactory, MetricFactory>();
+        return services;
+    }
 
-        /// <summary>
-        ///     Add IMetricFactory and ICollectorRegistry into service collection
-        /// </summary>
-        /// <param name="services">Service collection</param>
-        /// <param name="collectorRegistry">Explicit collector registry to use</param>
-        public static IServiceCollection AddMetricFactory(this IServiceCollection services, ICollectorRegistry collectorRegistry)
-        {
-            services.AddSingleton(collectorRegistry);
-            services.AddSingleton<IMetricFactory, MetricFactory>();
-            return services;
-        }
+    /// <summary>
+    ///     Add IMetricFactory and ICollectorRegistry into service collection
+    /// </summary>
+    /// <param name="services">Service collection</param>
+    /// <param name="collectorRegistry">Explicit collector registry to use</param>
+    public static IServiceCollection AddMetricFactory(this IServiceCollection services, ICollectorRegistry collectorRegistry)
+    {
+        services.AddSingleton(collectorRegistry);
+        services.AddSingleton<IMetricFactory, MetricFactory>();
+        return services;
     }
 }

tests/ServiceCollectionExtensionsTests.cs

@@ -2,48 +2,47 @@
 using Prometheus.Client.Collectors;
 using Xunit;
 
-namespace Prometheus.Client.DependencyInjection.Tests
+namespace Prometheus.Client.DependencyInjection.Tests;
+
+public class ServiceCollectionExtensionsTests
 {
-    public class ServiceCollectionExtensionsTests
+    [Fact]
+    public void Check_AddMetricFactory()
+    {
+        var sp = new ServiceCollection()
+            .AddMetricFactory()
+            .BuildServiceProvider();
+
+        var metricFactory = sp.GetService<IMetricFactory>();
+        Assert.NotNull(metricFactory);
+    }
+
+    [Fact]
+    public void Check_AddMetricFactory_Custom_CollectorRegistry()
+    {
+        var collectorRegistry = new CollectorRegistry();
+
+        var sp = new ServiceCollection()
+            .AddMetricFactory(collectorRegistry)
+            .BuildServiceProvider();
+
+        var metricFactory = sp.GetService<IMetricFactory>();
+        Assert.NotNull(metricFactory);
+
+        var actualCollectorRegistry = sp.GetService<ICollectorRegistry>();
+        Assert.Equal(collectorRegistry, actualCollectorRegistry);
+        Assert.NotEqual(Metrics.DefaultCollectorRegistry, actualCollectorRegistry);
+    }
+
+    [Fact]
+    public void Check_AddMetricFactory_Default_CollectorRegistry()
     {
-        [Fact]
-        public void Check_AddMetricFactory()
-        {
-            var serviceCollection = new ServiceCollection();
-            serviceCollection.AddMetricFactory();
-            var serviceProvider = serviceCollection.BuildServiceProvider();
-            var metrricFactory = serviceProvider.GetService<IMetricFactory>();
-            Assert.NotNull(metrricFactory);
-        }
-
-        [Fact]
-        public void Check_AddMetricFactory_Custom_CollectorRegistry()
-        {
-            var collectorRegistry = new CollectorRegistry();
-
-            var serviceCollection = new ServiceCollection();
-            serviceCollection.AddMetricFactory(collectorRegistry);
-            var serviceProvider = serviceCollection.BuildServiceProvider();
-            var metrricFactory = serviceProvider.GetService<IMetricFactory>();
-
-            Assert.NotNull(metrricFactory);
-
-            var actualCollectorRegistry = serviceProvider.GetService<ICollectorRegistry>();
-            Assert.Equal(collectorRegistry, actualCollectorRegistry);
-            Assert.NotEqual(Metrics.DefaultCollectorRegistry, actualCollectorRegistry);
-        }
-
-        [Fact]
-        public void Check_AddMetricFactory_Default_CollectorRegistry()
-        {
-            var serviceCollection = new ServiceCollection();
-            serviceCollection.AddMetricFactory(Metrics.DefaultCollectorRegistry);
-            var serviceProvider = serviceCollection.BuildServiceProvider();
-            var metrricFactory = serviceProvider.GetService<IMetricFactory>();
-
-            Assert.NotNull(metrricFactory);
-
-            Assert.Equal(Metrics.DefaultCollectorRegistry, serviceProvider.GetService<ICollectorRegistry>());
-        }
+        var sp = new ServiceCollection()
+            .AddMetricFactory(Metrics.DefaultCollectorRegistry)
+            .BuildServiceProvider();
+
+        var metricFactory = sp.GetService<IMetricFactory>();
+        Assert.NotNull(metricFactory);
+        Assert.Equal(Metrics.DefaultCollectorRegistry, sp.GetService<ICollectorRegistry>());
     }
 }