From 8ed9d0aac223e2566af4334b6293624def5e7cd5 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Tue, 28 Aug 2018 11:00:11 +1200 Subject: [PATCH] Use Endpoint instead of RouteEndpoint where possible (#8331) --- build/dependencies.props | 146 +++++++++--------- .../Routing/ConsumesMatcherPolicy.cs | 4 +- .../ActionConstraintMatcherPolicyTest.cs | 6 +- 3 files changed, 76 insertions(+), 80 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index d6804c2325..b0c3540479 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -7,7 +7,7 @@ is not otherwise referenced. They avoid unnecessary changes to the Universe build graph or to product dependencies. Do not use these properties elsewhere. --> - + 0.9.9 0.10.13 2.1.1 @@ -16,87 +16,87 @@ 0.43.0 2.1.1.1 2.1.1 - 2.2.0-preview1-34967 + 2.2.0-preview2-35090 2.2.0-preview1-20180807.2 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-a-preview2-routepattern-defaults-16901 - 2.2.0-a-preview2-routepattern-defaults-16901 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 5.2.6 2.8.0 2.8.0 - 2.2.0-preview1-34967 + 2.2.0-preview2-35090 1.7.0 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 2.1.0 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 + 2.2.0-preview2-35090 + 2.2.0-preview2-35090 15.6.1 4.7.49 2.0.3 diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/ConsumesMatcherPolicy.cs b/src/Microsoft.AspNetCore.Mvc.Core/Routing/ConsumesMatcherPolicy.cs index 507d3bcf68..65dd1d117b 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/Routing/ConsumesMatcherPolicy.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/Routing/ConsumesMatcherPolicy.cs @@ -135,14 +135,12 @@ namespace Microsoft.AspNetCore.Mvc.Routing private Endpoint CreateRejectionEndpoint() { - return new RouteEndpoint( + return new Endpoint( (context) => { context.Response.StatusCode = StatusCodes.Status415UnsupportedMediaType; return Task.CompletedTask; }, - RoutePatternFactory.Parse("/"), - 0, EndpointMetadataCollection.Empty, Http415EndpointDisplayName); } diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ActionConstraintMatcherPolicyTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ActionConstraintMatcherPolicyTest.cs index e2f02e7f63..298786c121 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ActionConstraintMatcherPolicyTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ActionConstraintMatcherPolicyTest.cs @@ -370,13 +370,11 @@ namespace Microsoft.AspNetCore.Mvc.Routing return httpContext; } - private static RouteEndpoint CreateEndpoint(ActionDescriptor action) + private static Endpoint CreateEndpoint(ActionDescriptor action) { var metadata = new List() { action, }; - return new RouteEndpoint( + return new Endpoint( (context) => Task.CompletedTask, - RoutePatternFactory.Parse("/"), - 0, new EndpointMetadataCollection(metadata), $"test: {action?.DisplayName}"); }