[Route Groups] Support AddFilter, WithOpenApi and other additive conventions

src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs

@@ -1577,12 +1577,13 @@ public async Task BranchingPipelineHasOwnRoutes()
         app.Start();
 
         var ds = app.Services.GetRequiredService<EndpointDataSource>();
-        Assert.Equal(5, ds.Endpoints.Count);
-        Assert.Equal("One", ds.Endpoints[0].DisplayName);
-        Assert.Equal("Two", ds.Endpoints[1].DisplayName);
-        Assert.Equal("Three", ds.Endpoints[2].DisplayName);
-        Assert.Equal("Four", ds.Endpoints[3].DisplayName);
-        Assert.Equal("Five", ds.Endpoints[4].DisplayName);
+        var displayNames = ds.Endpoints.Select(e => e.DisplayName).ToArray();
+        Assert.Equal(5, displayNames.Length);
+        Assert.Contains("One", displayNames);
+        Assert.Contains("Two", displayNames);
+        Assert.Contains("Three", displayNames);
+        Assert.Contains("Four", displayNames);
+        Assert.Contains("Five", displayNames);
 
         var client = app.GetTestClient();
 

src/Http/Http.Abstractions/src/Extensions/EndpointBuilder.cs

@@ -28,11 +28,17 @@ public abstract class EndpointBuilder
     /// <summary>
     /// Gets the <see cref="IServiceProvider"/> associated with the endpoint.
     /// </summary>
-    public IServiceProvider? ServiceProvider { get; set; }
+    public IServiceProvider ApplicationServices { get; set; } = EmptyServiceProvicer.Instance;
 
     /// <summary>
     /// Creates an instance of <see cref="Endpoint"/> from the <see cref="EndpointBuilder"/>.
     /// </summary>
     /// <returns>The created <see cref="Endpoint"/>.</returns>
     public abstract Endpoint Build();
+
+    private sealed class EmptyServiceProvicer : IServiceProvider
+    {
+        public static EmptyServiceProvicer Instance { get; } = new EmptyServiceProvicer();
+        public object? GetService(Type serviceType) => null;
+    }
 }

src/Http/Http.Abstractions/src/PublicAPI.Unshipped.txt

@@ -1,8 +1,8 @@
 #nullable enable
 *REMOVED*abstract Microsoft.AspNetCore.Http.HttpResponse.ContentType.get -> string!
 *REMOVED*Microsoft.AspNetCore.Http.EndpointMetadataCollection.Enumerator.Current.get -> object?
-Microsoft.AspNetCore.Builder.EndpointBuilder.ServiceProvider.get -> System.IServiceProvider?
-Microsoft.AspNetCore.Builder.EndpointBuilder.ServiceProvider.set -> void
+Microsoft.AspNetCore.Builder.EndpointBuilder.ApplicationServices.get -> System.IServiceProvider!
+Microsoft.AspNetCore.Builder.EndpointBuilder.ApplicationServices.set -> void
 Microsoft.AspNetCore.Http.AsParametersAttribute
 Microsoft.AspNetCore.Http.AsParametersAttribute.AsParametersAttribute() -> void
 Microsoft.AspNetCore.Http.DefaultRouteHandlerInvocationContext
@@ -18,9 +18,9 @@ Microsoft.AspNetCore.Http.Metadata.IRequestSizeLimitMetadata
 Microsoft.AspNetCore.Http.Metadata.IRequestSizeLimitMetadata.MaxRequestBodySize.get -> long?
 Microsoft.AspNetCore.Http.RouteHandlerContext
 Microsoft.AspNetCore.Http.RouteHandlerContext.ApplicationServices.get -> System.IServiceProvider!
-Microsoft.AspNetCore.Http.RouteHandlerContext.EndpointMetadata.get -> Microsoft.AspNetCore.Http.EndpointMetadataCollection!
+Microsoft.AspNetCore.Http.RouteHandlerContext.EndpointMetadata.get -> System.Collections.Generic.IList<object!>!
 Microsoft.AspNetCore.Http.RouteHandlerContext.MethodInfo.get -> System.Reflection.MethodInfo!
-Microsoft.AspNetCore.Http.RouteHandlerContext.RouteHandlerContext(System.Reflection.MethodInfo! methodInfo, Microsoft.AspNetCore.Http.EndpointMetadataCollection! endpointMetadata, System.IServiceProvider! applicationServices) -> void
+Microsoft.AspNetCore.Http.RouteHandlerContext.RouteHandlerContext(System.Reflection.MethodInfo! methodInfo, System.Collections.Generic.IList<object!>! endpointMetadata, System.IServiceProvider! applicationServices) -> void
 Microsoft.AspNetCore.Http.RouteHandlerFilterDelegate
 Microsoft.AspNetCore.Http.RouteHandlerInvocationContext
 Microsoft.AspNetCore.Http.RouteHandlerInvocationContext.RouteHandlerInvocationContext() -> void

src/Http/Http.Abstractions/src/RequestDelegateResult.cs

@@ -23,7 +23,8 @@ public RequestDelegateResult(RequestDelegate requestDelegate, IReadOnlyList<obje
     public RequestDelegate RequestDelegate { get; }
 
     /// <summary>
-    /// Gets endpoint metadata inferred from creating the <see cref="RequestDelegate" />
+    /// Gets endpoint metadata inferred from creating the <see cref="RequestDelegate" />. If a non-null
+    /// RequestDelegateFactoryOptions.EndpointMetadata list was passed in, this will be the same instance.
     /// </summary>
     public IReadOnlyList<object> EndpointMetadata { get; }
 }

src/Http/Http.Abstractions/src/RouteHandlerContext.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Reflection;
+using Microsoft.AspNetCore.Builder;
 
 namespace Microsoft.AspNetCore.Http;
 
@@ -15,9 +16,9 @@ public sealed class RouteHandlerContext
     /// Creates a new instance of the <see cref="RouteHandlerContext"/>.
     /// </summary>
     /// <param name="methodInfo">The <see cref="MethodInfo"/> associated with the route handler of the current request.</param>
-    /// <param name="endpointMetadata">The <see cref="EndpointMetadataCollection"/> associated with the endpoint the filter is targeting.</param>
+    /// <param name="endpointMetadata">The <see cref="EndpointBuilder.Metadata"/> associated with the endpoint the filter is targeting.</param>
     /// <param name="applicationServices">The <see cref="IServiceProvider"/> instance used to access the application services.</param>
-    public RouteHandlerContext(MethodInfo methodInfo, EndpointMetadataCollection endpointMetadata, IServiceProvider applicationServices)
+    public RouteHandlerContext(MethodInfo methodInfo, IList<object> endpointMetadata, IServiceProvider applicationServices)
     {
         ArgumentNullException.ThrowIfNull(methodInfo);
         ArgumentNullException.ThrowIfNull(endpointMetadata);
@@ -36,7 +37,7 @@ public RouteHandlerContext(MethodInfo methodInfo, EndpointMetadataCollection end
     /// <summary>
     /// The <see cref="EndpointMetadataCollection"/> associated with the current endpoint.
     /// </summary>
-    public EndpointMetadataCollection EndpointMetadata { get; }
+    public IList<object> EndpointMetadata { get; }
 
     /// <summary>
     /// Gets the <see cref="IServiceProvider"/> instance used to access application services.

src/Http/Http.Extensions/src/PublicAPI.Unshipped.txt

@@ -13,8 +13,8 @@ Microsoft.AspNetCore.Http.Metadata.IEndpointMetadataProvider
 Microsoft.AspNetCore.Http.Metadata.IEndpointMetadataProvider.PopulateMetadata(Microsoft.AspNetCore.Http.Metadata.EndpointMetadataContext! context) -> void
 Microsoft.AspNetCore.Http.Metadata.IEndpointParameterMetadataProvider
 Microsoft.AspNetCore.Http.Metadata.IEndpointParameterMetadataProvider.PopulateMetadata(Microsoft.AspNetCore.Http.Metadata.EndpointParameterMetadataContext! parameterContext) -> void
-Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions.InitialEndpointMetadata.get -> System.Collections.Generic.IEnumerable<object!>?
-Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions.InitialEndpointMetadata.init -> void
+Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions.EndpointMetadata.get -> System.Collections.Generic.IList<object!>?
+Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions.EndpointMetadata.init -> void
 Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions.RouteHandlerFilterFactories.get -> System.Collections.Generic.IReadOnlyList<System.Func<Microsoft.AspNetCore.Http.RouteHandlerContext!, Microsoft.AspNetCore.Http.RouteHandlerFilterDelegate!, Microsoft.AspNetCore.Http.RouteHandlerFilterDelegate!>!>?
 Microsoft.AspNetCore.Http.RequestDelegateFactoryOptions.RouteHandlerFilterFactories.init -> void
 Microsoft.Extensions.DependencyInjection.RouteHandlerJsonServiceExtensions