Add MapActionEndpointConventionBuilder

Author: halter73

src/Http/Routing/src/Builder/MapActionEndpointConventionBuilder.cs

@@ -0,0 +1,33 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.AspNetCore.Builder
+{
+    /// <summary>
+    /// Builds conventions that will be used for customization of MapAction <see cref="EndpointBuilder"/> instances.
+    /// </summary>
+    public sealed class MapActionEndpointConventionBuilder : IEndpointConventionBuilder
+    {
+        private readonly List<IEndpointConventionBuilder> _endpointConventionBuilders;
+
+        internal MapActionEndpointConventionBuilder(List<IEndpointConventionBuilder> endpointConventionBuilders)
+        {
+            _endpointConventionBuilders = endpointConventionBuilders;
+        }
+
+        /// <summary>
+        /// Adds the specified convention to the builder. Conventions are used to customize <see cref="EndpointBuilder"/> instances.
+        /// </summary>
+        /// <param name="convention">The convention to add to the builder.</param>
+        public void Add(Action<EndpointBuilder> convention)
+        {
+            foreach (var endpointConventionBuilder in _endpointConventionBuilders)
+            {
+                endpointConventionBuilder.Add(convention);
+            }
+        }
+    }
+}

src/Http/Routing/src/Builder/MapActionEndpointRouteBuilderExtensions.cs

@@ -20,8 +20,8 @@ public static class MapActionEndpointRouteBuilderExtensions
         /// </summary>
         /// <param name="endpoints">The <see cref="IEndpointRouteBuilder"/> to add the route to.</param>
         /// <param name="action">The delegate executed when the endpoint is matched.</param>
-        /// <returns>A <see cref="IEndpointConventionBuilder"/> that can be used to further customize the endpoint.</returns>
-        public static IEndpointConventionBuilder MapAction(
+        /// <returns>An <see cref="IEndpointConventionBuilder"/> that can be used to further customize the endpoint.</returns>
+        public static MapActionEndpointConventionBuilder MapAction(
             this IEndpointRouteBuilder endpoints,
             Delegate action)
         {
@@ -61,7 +61,6 @@ public static IEndpointConventionBuilder MapAction(
                         endpointBuilder.Metadata.Add(attribute);
                     }
 
-
                     endpointBuilder.DisplayName = routeName ?? pattern;
 
                     ((RouteEndpointBuilder)endpointBuilder).Order = routeOrder ?? defaultOrder;
@@ -75,25 +74,7 @@ public static IEndpointConventionBuilder MapAction(
                 throw new InvalidOperationException("Action must have a pattern. Is it missing a Route attribute?");
             }
 
-            return new CompositeEndpointConventionBuilder(conventionBuilders);
-        }
-
-        private class CompositeEndpointConventionBuilder : IEndpointConventionBuilder
-        {
-            private readonly List<IEndpointConventionBuilder> _endpointConventionBuilders;
-
-            public CompositeEndpointConventionBuilder(List<IEndpointConventionBuilder> endpointConventionBuilders)
-            {
-                _endpointConventionBuilders = endpointConventionBuilders;
-            }
-
-            public void Add(Action<EndpointBuilder> convention)
-            {
-                foreach (var endpointConventionBuilder in _endpointConventionBuilders)
-                {
-                    endpointConventionBuilder.Add(convention);
-                }
-            }
+            return new MapActionEndpointConventionBuilder(conventionBuilders);
         }
     }
 }

src/Http/Routing/src/PublicAPI.Unshipped.txt

@@ -5,6 +5,8 @@
 *REMOVED*Microsoft.AspNetCore.Routing.IRouteNameMetadata.RouteName.get -> string!
 *REMOVED*Microsoft.AspNetCore.Routing.RouteNameMetadata.RouteName.get -> string!
 *REMOVED*Microsoft.AspNetCore.Routing.RouteNameMetadata.RouteNameMetadata(string! routeName) -> void
+Microsoft.AspNetCore.Builder.MapActionEndpointConventionBuilder
+Microsoft.AspNetCore.Builder.MapActionEndpointConventionBuilder.Add(System.Action<Microsoft.AspNetCore.Builder.EndpointBuilder!>! convention) -> void
 Microsoft.AspNetCore.Builder.MapActionEndpointRouteBuilderExtensions
 Microsoft.AspNetCore.Routing.DataTokensMetadata.DataTokens.get -> System.Collections.Generic.IReadOnlyDictionary<string!, object?>!
 Microsoft.AspNetCore.Routing.DataTokensMetadata.DataTokensMetadata(System.Collections.Generic.IReadOnlyDictionary<string!, object?>! dataTokens) -> void
@@ -16,4 +18,4 @@ Microsoft.AspNetCore.Routing.IRoutePatternMetadata
 Microsoft.AspNetCore.Routing.IRoutePatternMetadata.RoutePattern.get -> string?
 Microsoft.AspNetCore.Routing.RouteNameMetadata.RouteName.get -> string?
 Microsoft.AspNetCore.Routing.RouteNameMetadata.RouteNameMetadata(string? routeName) -> void
-static Microsoft.AspNetCore.Builder.MapActionEndpointRouteBuilderExtensions.MapAction(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpoints, System.Delegate! action) -> Microsoft.AspNetCore.Builder.IEndpointConventionBuilder!
+static Microsoft.AspNetCore.Builder.MapActionEndpointRouteBuilderExtensions.MapAction(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpoints, System.Delegate! action) -> Microsoft.AspNetCore.Builder.MapActionEndpointConventionBuilder!