Move utility into extension method

khellang · May 23, 2022 · e03e051 · e03e051
1 parent 4b7b637
commit e03e051
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/Scrutor/Decoration/Decorator.cs b/src/Scrutor/Decoration/Decorator.cs
@@ -57,13 +57,11 @@ private int DecorateServices(IServiceCollection services)
                 {
                     var decoratedType = new DecoratedType(serviceDescriptor.ServiceType);
 
-                    var decoratorFactory = DecoratorStrategy.CreateDecorator(decoratedType);
-
                     // insert decorated
-                    var decoratedServiceDescriptor = CreateDecoratedServiceDescriptor(serviceDescriptor, decoratedType);
-                    services.Add(decoratedServiceDescriptor);
+                    services.Add(serviceDescriptor.WithServiceType(decoratedType));
 
                     // replace decorator
+                    var decoratorFactory = DecoratorStrategy.CreateDecorator(decoratedType);
                     services[i] = new ServiceDescriptor(serviceDescriptor.ServiceType, decoratorFactory, serviceDescriptor.Lifetime);
 
                     ++decorated;
@@ -74,13 +72,5 @@ private int DecorateServices(IServiceCollection services)
         }
 
         private static bool IsNotAlreadyDecorated(ServiceDescriptor serviceDescriptor) => serviceDescriptor.ServiceType is not DecoratedType;
-
-        private static ServiceDescriptor CreateDecoratedServiceDescriptor(ServiceDescriptor serviceDescriptor, Type decoratedType) => serviceDescriptor switch
-        {
-            { ImplementationType: not null } => new ServiceDescriptor(decoratedType, serviceDescriptor.ImplementationType, serviceDescriptor.Lifetime),
-            { ImplementationFactory: not null } => new ServiceDescriptor(decoratedType, serviceDescriptor.ImplementationFactory, serviceDescriptor.Lifetime),
-            { ImplementationInstance: not null } => new ServiceDescriptor(decoratedType, serviceDescriptor.ImplementationInstance),
-            _ => throw new ArgumentException($"No implementation factory or instance or type found for {serviceDescriptor.ServiceType}.", nameof(serviceDescriptor))
-        };
     }
 }
diff --git a/src/Scrutor/ServiceDescriptorExtensions.cs b/src/Scrutor/ServiceDescriptorExtensions.cs
@@ -0,0 +1,15 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Scrutor;
+
+internal static class ServiceDescriptorExtensions
+{
+    public static ServiceDescriptor WithServiceType(this ServiceDescriptor descriptor, Type serviceType) => descriptor switch
+    {
+        { ImplementationType: not null } => new ServiceDescriptor(serviceType, descriptor.ImplementationType, descriptor.Lifetime),
+        { ImplementationFactory: not null } => new ServiceDescriptor(serviceType, descriptor.ImplementationFactory, descriptor.Lifetime),
+        { ImplementationInstance: not null } => new ServiceDescriptor(serviceType, descriptor.ImplementationInstance),
+        _ => throw new ArgumentException($"No implementation factory or instance or type found for {descriptor.ServiceType}.", nameof(descriptor))
+    };
+}