Fix S4136: reorder methods so overloads are adjacent.

Author: tillig

src/Autofac/Core/Registration/ComponentRegistryBuilder.cs

@@ -130,22 +130,6 @@ public void Register(IComponentRegistration registration)
         _registeredServicesTracker.AddRegistration(registration, false);
     }
 
-    /// <inheritdoc/>
-    public void RegisterServiceMiddleware(Service service, IResolveMiddleware middleware, MiddlewareInsertionMode insertionMode = MiddlewareInsertionMode.EndOfPhase)
-    {
-        if (service is null)
-        {
-            throw new ArgumentNullException(nameof(service));
-        }
-
-        if (middleware is null)
-        {
-            throw new ArgumentNullException(nameof(middleware));
-        }
-
-        _registeredServicesTracker.AddServiceMiddleware(service, middleware, insertionMode);
-    }
-
     /// <summary>
     /// Register a component.
     /// </summary>
@@ -162,6 +146,22 @@ public void Register(IComponentRegistration registration, bool preserveDefaults)
         _registeredServicesTracker.AddRegistration(registration, preserveDefaults);
     }
 
+    /// <inheritdoc/>
+    public void RegisterServiceMiddleware(Service service, IResolveMiddleware middleware, MiddlewareInsertionMode insertionMode = MiddlewareInsertionMode.EndOfPhase)
+    {
+        if (service is null)
+        {
+            throw new ArgumentNullException(nameof(service));
+        }
+
+        if (middleware is null)
+        {
+            throw new ArgumentNullException(nameof(middleware));
+        }
+
+        _registeredServicesTracker.AddServiceMiddleware(service, middleware, insertionMode);
+    }
+
     /// <summary>
     /// Add a registration source that will provide registrations on-the-fly.
     /// </summary>

src/Autofac/RegistrationExtensions.Decorators.cs

@@ -17,44 +17,6 @@ namespace Autofac;
 [SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling", Justification = "RegistrationBuilder is where all registration syntax lives.")]
 public static partial class RegistrationExtensions
 {
-    /// <summary>
-    /// Decorate all components implementing open generic service <paramref name="decoratedServiceType"/>.
-    /// The <paramref name="fromKey"/> and <paramref name="toKey"/> parameters must be different values.
-    /// </summary>
-    /// <param name="builder">Container builder.</param>
-    /// <param name="decoratorType">
-    /// The type of the decorator. Must be an open generic type, and accept a parameter
-    /// of type <paramref name="decoratedServiceType"/>, which will be set to the instance being decorated.
-    /// </param>
-    /// <param name="decoratedServiceType">Service type being decorated. Must be an open generic type.</param>
-    /// <param name="fromKey">Service key or name associated with the components being decorated.</param>
-    /// <param name="toKey">Service key or name given to the decorated components.</param>
-    /// <returns>The decorator registration for continued configuration.</returns>
-    public static IRegistrationBuilder<object, OpenGenericDecoratorActivatorData, DynamicRegistrationStyle>
-        RegisterGenericDecorator(
-            this ContainerBuilder builder,
-            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type decoratorType,
-            Type decoratedServiceType,
-            object fromKey,
-            object? toKey = null)
-    {
-        if (builder == null)
-        {
-            throw new ArgumentNullException(nameof(builder));
-        }
-
-        if (decoratorType == null)
-        {
-            throw new ArgumentNullException(nameof(decoratorType));
-        }
-
-        if (decoratedServiceType == null)
-        {
-            throw new ArgumentNullException(nameof(decoratedServiceType));
-        }
-
-        return OpenGenericRegistrationExtensions.RegisterGenericDecorator(builder, decoratorType, decoratedServiceType, fromKey, toKey);
-    }
 
     /// <summary>
     /// Decorate all components implementing service <typeparamref name="TService"/>
@@ -275,6 +237,45 @@ public static void RegisterDecorator<TService>(
         builder.RegisterCallback(crb => crb.Register(decoratorRegistration));
     }
 
+    /// <summary>
+    /// Decorate all components implementing open generic service <paramref name="decoratedServiceType"/>.
+    /// The <paramref name="fromKey"/> and <paramref name="toKey"/> parameters must be different values.
+    /// </summary>
+    /// <param name="builder">Container builder.</param>
+    /// <param name="decoratorType">
+    /// The type of the decorator. Must be an open generic type, and accept a parameter
+    /// of type <paramref name="decoratedServiceType"/>, which will be set to the instance being decorated.
+    /// </param>
+    /// <param name="decoratedServiceType">Service type being decorated. Must be an open generic type.</param>
+    /// <param name="fromKey">Service key or name associated with the components being decorated.</param>
+    /// <param name="toKey">Service key or name given to the decorated components.</param>
+    /// <returns>The decorator registration for continued configuration.</returns>
+    public static IRegistrationBuilder<object, OpenGenericDecoratorActivatorData, DynamicRegistrationStyle>
+        RegisterGenericDecorator(
+            this ContainerBuilder builder,
+            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] Type decoratorType,
+            Type decoratedServiceType,
+            object fromKey,
+            object? toKey = null)
+    {
+        if (builder == null)
+        {
+            throw new ArgumentNullException(nameof(builder));
+        }
+
+        if (decoratorType == null)
+        {
+            throw new ArgumentNullException(nameof(decoratorType));
+        }
+
+        if (decoratedServiceType == null)
+        {
+            throw new ArgumentNullException(nameof(decoratedServiceType));
+        }
+
+        return OpenGenericRegistrationExtensions.RegisterGenericDecorator(builder, decoratorType, decoratedServiceType, fromKey, toKey);
+    }
+
     /// <summary>
     /// Decorate all components implementing open generic service <paramref name="serviceType"/>.
     /// </summary>

src/Autofac/RegistrationExtensions.cs

@@ -229,6 +229,32 @@ public static IRegistrationBuilder<TLimit, TScanningActivatorData, TRegistration
         return registration;
     }
 
+    /// <summary>
+    /// Specify how a type from a scanned assembly provides metadata.
+    /// </summary>
+    /// <typeparam name="TLimit">Registration limit type.</typeparam>
+    /// <typeparam name="TScanningActivatorData">Activator data type.</typeparam>
+    /// <typeparam name="TRegistrationStyle">Registration style.</typeparam>
+    /// <param name="registration">Registration to set service mapping on.</param>
+    /// <param name="metadataKey">Key of the metadata item.</param>
+    /// <param name="metadataValueMapping">A function retrieving the value of the item from the component type.</param>
+    /// <returns>Registration builder allowing the registration to be configured.</returns>
+    public static IRegistrationBuilder<TLimit, TScanningActivatorData, TRegistrationStyle>
+        WithMetadata<TLimit, TScanningActivatorData, TRegistrationStyle>(
+            this IRegistrationBuilder<TLimit, TScanningActivatorData, TRegistrationStyle> registration,
+            string metadataKey,
+            Func<Type, object> metadataValueMapping)
+        where TScanningActivatorData : ScanningActivatorData
+    {
+        if (registration == null)
+        {
+            throw new ArgumentNullException(nameof(registration));
+        }
+
+        return registration.WithMetadata(t =>
+            new[] { new KeyValuePair<string, object?>(metadataKey, metadataValueMapping(t)) });
+    }
+
     /// <summary>
     /// Use the properties of an attribute (or interface implemented by an attribute) on the scanned type
     /// to provide metadata values.
@@ -266,32 +292,6 @@ public static IRegistrationBuilder<object, ScanningActivatorData, DynamicRegistr
         });
     }
 
-    /// <summary>
-    /// Specify how a type from a scanned assembly provides metadata.
-    /// </summary>
-    /// <typeparam name="TLimit">Registration limit type.</typeparam>
-    /// <typeparam name="TScanningActivatorData">Activator data type.</typeparam>
-    /// <typeparam name="TRegistrationStyle">Registration style.</typeparam>
-    /// <param name="registration">Registration to set service mapping on.</param>
-    /// <param name="metadataKey">Key of the metadata item.</param>
-    /// <param name="metadataValueMapping">A function retrieving the value of the item from the component type.</param>
-    /// <returns>Registration builder allowing the registration to be configured.</returns>
-    public static IRegistrationBuilder<TLimit, TScanningActivatorData, TRegistrationStyle>
-        WithMetadata<TLimit, TScanningActivatorData, TRegistrationStyle>(
-            this IRegistrationBuilder<TLimit, TScanningActivatorData, TRegistrationStyle> registration,
-            string metadataKey,
-            Func<Type, object> metadataValueMapping)
-        where TScanningActivatorData : ScanningActivatorData
-    {
-        if (registration == null)
-        {
-            throw new ArgumentNullException(nameof(registration));
-        }
-
-        return registration.WithMetadata(t =>
-            new[] { new KeyValuePair<string, object?>(metadataKey, metadataValueMapping(t)) });
-    }
-
     /// <summary>
     /// Set the policy used to find candidate constructors on the implementation type.
     /// </summary>