Add CORS support to HttpMethodMatcherPolicy

Also removes HttpMethodEndpointConstraint, since it's been fully
replaced.

Author: rynowak

benchmarks/Microsoft.AspNetCore.Routing.Performance/Matchers/MatcherAzureBenchmark.cs

@@ -13,7 +13,6 @@ public partial class MatcherAzureBenchmark : MatcherBenchmarkBase
 
         private BarebonesMatcher _baseline;
         private Matcher _dfa;
-        private Matcher _tree;
 
         private int[] _samples;
         private EndpointFeature _feature;
@@ -31,7 +30,6 @@ public void Setup()
 
             _baseline = (BarebonesMatcher)SetupMatcher(new BarebonesMatcherBuilder());
             _dfa = SetupMatcher(CreateDfaMatcherBuilder());
-            _tree = SetupMatcher(new TreeRouterMatcherBuilder());
 
             _feature = new EndpointFeature();
         }
@@ -61,22 +59,5 @@ public async Task Dfa()
                 Validate(httpContext, Endpoints[sample], feature.Endpoint);
             }
         }
-
-        [Benchmark(OperationsPerInvoke = SampleCount)]
-        public async Task LegacyTreeRouter()
-        {
-            var feature = _feature;
-            for (var i = 0; i < SampleCount; i++)
-            {
-                var sample = _samples[i];
-                var httpContext = Requests[sample];
-
-                // This is required to make the legacy router implementation work with global routing.
-                httpContext.Features.Set<IEndpointFeature>(feature);
-
-                await _tree.MatchAsync(httpContext, feature);
-                Validate(httpContext, Endpoints[sample], feature.Endpoint);
-            }
-        }
     }
 }

benchmarks/Microsoft.AspNetCore.Routing.Performance/Matchers/MatcherBenchmarkBase.cs

@@ -39,7 +39,7 @@ private protected static MatcherEndpoint CreateEndpoint(string template, string
             var metadata = new List<object>();
             if (httpMethod != null)
             {
-                metadata.Add(new HttpMethodEndpointConstraint(new string[] { httpMethod, }));
+                metadata.Add(new HttpMethodMetadata(new string[] { httpMethod, }));
             }
 
             return new MatcherEndpoint(

benchmarks/Microsoft.AspNetCore.Routing.Performance/Matchers/MatcherGithubBenchmark.cs

@@ -12,7 +12,6 @@ public partial class MatcherGithubBenchmark : MatcherBenchmarkBase
     {
         private BarebonesMatcher _baseline;
         private Matcher _dfa;
-        private Matcher _tree;
 
         private EndpointFeature _feature;
 
@@ -25,7 +24,6 @@ public void Setup()
 
             _baseline = (BarebonesMatcher)SetupMatcher(new BarebonesMatcherBuilder());
             _dfa = SetupMatcher(CreateDfaMatcherBuilder());
-            _tree = SetupMatcher(new TreeRouterMatcherBuilder());
 
             _feature = new EndpointFeature();
         }
@@ -53,21 +51,5 @@ public async Task Dfa()
                 Validate(httpContext, Endpoints[i], feature.Endpoint);
             }
         }
-
-        [Benchmark(OperationsPerInvoke = EndpointCount)]
-        public async Task LegacyTreeRouter()
-        {
-            var feature = _feature;
-            for (var i = 0; i < EndpointCount; i++)
-            {
-                var httpContext = Requests[i];
-
-                // This is required to make the legacy router implementation work with global routing.
-                httpContext.Features.Set<IEndpointFeature>(feature);
-
-                await _tree.MatchAsync(httpContext, feature);
-                Validate(httpContext, Endpoints[i], feature.Endpoint);
-            }
-        }
     }
 }

src/Microsoft.AspNetCore.Routing/CompositeEndpointDataSource.cs

@@ -9,6 +9,7 @@
 using System.Threading;
 using Microsoft.AspNetCore.Routing.EndpointConstraints;
 using Microsoft.AspNetCore.Routing.Matchers;
+using Microsoft.AspNetCore.Routing.Metadata;
 using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNetCore.Routing
@@ -134,15 +135,16 @@ private string DebuggerDisplayString
                         sb.Append(", Order:");
                         sb.Append(matcherEndpoint.Order);
 
-                        var httpEndpointConstraints = matcherEndpoint.Metadata.GetOrderedMetadata<IEndpointConstraintMetadata>()
-                            .OfType<HttpMethodEndpointConstraint>();
-                        foreach (var constraint in httpEndpointConstraints)
+                        var httpMethodMetadata = matcherEndpoint.Metadata.GetMetadata<IHttpMethodMetadata>();
+                        if (httpMethodMetadata != null)
                         {
-                            sb.Append(", Http Methods: ");
-                            sb.Append(string.Join(", ", constraint.HttpMethods));
-                            sb.Append(", Constraint Order:");
-                            sb.Append(constraint.Order);
+                            foreach (var httpMethod in httpMethodMetadata.HttpMethods)
+                            {
+                                sb.Append(", Http Methods: ");
+                                sb.Append(string.Join(", ", httpMethod));
+                            }
                         }
+
                         sb.AppendLine();
                     }
                     else

src/Microsoft.AspNetCore.Routing/DependencyInjection/RoutingServiceCollectionExtensions.cs

@@ -79,7 +79,7 @@ public static IServiceCollection AddRouting(this IServiceCollection services)
             //
             services.TryAddSingleton<EndpointSelector, EndpointConstraintEndpointSelector>();
             services.TryAddSingleton<EndpointConstraintCache>();
-            services.TryAddEnumerable(ServiceDescriptor.Singleton<MatcherPolicy, HttpMethodEndpointSelectorPolicy>());
+            services.TryAddEnumerable(ServiceDescriptor.Singleton<MatcherPolicy, HttpMethodMatcherPolicy>());
 
             // Will be cached by the EndpointSelector
             services.TryAddEnumerable(

src/Microsoft.AspNetCore.Routing/EndpointConstraints/HttpMethodEndpointConstraint.cs

@@ -43,6 +43,8 @@ public HttpMethodEndpointConstraint(IEnumerable<string> httpMethods)
 
         IReadOnlyList<string> IHttpMethodMetadata.HttpMethods => _httpMethods;
 
+        bool IHttpMethodMetadata.AcceptCorsPreflight => false;
+
         public virtual bool Accept(EndpointConstraintContext context)
         {
             if (context == null)