huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge fixes

This commit is contained in:
James Newton-King 2018-08-22 20:42:53 +12:00
parent aff4a38865
commit 5e8e490867
No known key found for this signature in database
GPG Key ID: 0A66B2F456BF5526
7 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/RoutingSample.Web/HelloExtension/EndpointDataSourceBuilderExtensions.cs
View File

@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Builder
.Build();
return builder.MapEndpoint(
(next) => pipeline,
pipeline,
template,
"Hello");
}

16
src/Microsoft.AspNetCore.Routing/Builder/MapEndpointEndpointDataSourceBuilderExtensions.cs
View File

@ -14,35 +14,35 @@ namespace Microsoft.AspNetCore.Builder
{
public static MatcherEndpointBuilder MapEndpoint(
this EndpointDataSourceBuilder builder,
Func<RequestDelegate, RequestDelegate> invoker,
RequestDelegate requestDelegate,
string pattern,
string displayName)
{
return MapEndpoint(builder, invoker, pattern, displayName, metadata: null);
return MapEndpoint(builder, requestDelegate, pattern, displayName, metadata: null);
}
public static MatcherEndpointBuilder MapEndpoint(
this EndpointDataSourceBuilder builder,
Func<RequestDelegate, RequestDelegate> invoker,
RequestDelegate requestDelegate,
RoutePattern pattern,
string displayName)
{
return MapEndpoint(builder, invoker, pattern, displayName, metadata: null);
return MapEndpoint(builder, requestDelegate, pattern, displayName, metadata: null);
}
public static MatcherEndpointBuilder MapEndpoint(
this EndpointDataSourceBuilder builder,
Func<RequestDelegate, RequestDelegate> invoker,
RequestDelegate requestDelegate,
string pattern,
string displayName,
IList<object> metadata)
{
return MapEndpoint(builder, invoker, RoutePatternFactory.Parse(pattern), displayName, metadata);
return MapEndpoint(builder, requestDelegate, RoutePatternFactory.Parse(pattern), displayName, metadata);
}
public static MatcherEndpointBuilder MapEndpoint(
this EndpointDataSourceBuilder builder,
Func<RequestDelegate, RequestDelegate> invoker,
RequestDelegate requestDelegate,
RoutePattern pattern,
string displayName,
IList<object> metadata)
@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Builder
const int defaultOrder = 0;
var endpointBuilder = new MatcherEndpointBuilder(
invoker,
requestDelegate,
pattern,
defaultOrder);
endpointBuilder.DisplayName = displayName;

1
src/Microsoft.AspNetCore.Routing/BuilderEndpointDataSource.cs
View File

@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Primitives;

1
src/Microsoft.AspNetCore.Routing/EndpointBuilder.cs
View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
using Microsoft.AspNetCore.Http;
namespace Microsoft.AspNetCore.Routing
{

10
src/Microsoft.AspNetCore.Routing/Matching/MatcherEndpointBuilder.cs
View File

@ -10,26 +10,26 @@ namespace Microsoft.AspNetCore.Routing.Matching
{
public sealed class MatcherEndpointBuilder : EndpointBuilder
{
public Func<RequestDelegate, RequestDelegate> Invoker { get; set; }
public RequestDelegate RequestDelegate { get; set; }
public RoutePattern RoutePattern { get; set; }
public int Order { get; set; }
public MatcherEndpointBuilder(
Func<RequestDelegate, RequestDelegate> invoker,
RequestDelegate requestDelegate,
RoutePattern routePattern,
int order)
{
Invoker = invoker;
RequestDelegate = requestDelegate;
RoutePattern = routePattern;
Order = order;
}
public override Endpoint Build()
{
var matcherEndpoint = new MatcherEndpoint(
Invoker,
var matcherEndpoint = new RouteEndpoint(
RequestDelegate,
RoutePattern,
Order,
new EndpointMetadataCollection(Metadata),

24
test/Microsoft.AspNetCore.Routing.Tests/Builder/MapEndpointEndpointDataSourceBuilderExtensionsTest.cs
View File

@ -19,14 +19,14 @@ namespace Microsoft.AspNetCore.Builder
{
// Arrange
var builder = new DefaultEndpointDataSourceBuilder();
Func<RequestDelegate, RequestDelegate> invoker = (d) => null;
RequestDelegate requestDelegate = (d) => null;
// Act
var endpointBuilder = builder.MapEndpoint(invoker, "/", "Display name!");
var endpointBuilder = builder.MapEndpoint(requestDelegate, "/", "Display name!");
// Assert
Assert.Equal(endpointBuilder, Assert.Single(builder.Endpoints));
Assert.Equal(invoker, endpointBuilder.Invoker);
Assert.Equal(requestDelegate, endpointBuilder.RequestDelegate);
Assert.Equal("Display name!", endpointBuilder.DisplayName);
Assert.Equal("/", endpointBuilder.RoutePattern.RawText);
}
@ -36,14 +36,14 @@ namespace Microsoft.AspNetCore.Builder
{
// Arrange
var builder = new DefaultEndpointDataSourceBuilder();
Func<RequestDelegate, RequestDelegate> invoker = (d) => null;
RequestDelegate requestDelegate = (d) => null;
// Act
var endpointBuilder = builder.MapEndpoint(invoker, RoutePatternFactory.Parse("/"), "Display name!");
var endpointBuilder = builder.MapEndpoint(requestDelegate, RoutePatternFactory.Parse("/"), "Display name!");
// Assert
Assert.Equal(endpointBuilder, Assert.Single(builder.Endpoints));
Assert.Equal(invoker, endpointBuilder.Invoker);
Assert.Equal(requestDelegate, endpointBuilder.RequestDelegate);
Assert.Equal("Display name!", endpointBuilder.DisplayName);
Assert.Equal("/", endpointBuilder.RoutePattern.RawText);
}
@ -54,14 +54,14 @@ namespace Microsoft.AspNetCore.Builder
// Arrange
var metadata = new object();
var builder = new DefaultEndpointDataSourceBuilder();
Func<RequestDelegate, RequestDelegate> invoker = (d) => null;
RequestDelegate requestDelegate = (d) => null;
// Act
var endpointBuilder = builder.MapEndpoint(invoker, "/", "Display name!", new[] { metadata });
var endpointBuilder = builder.MapEndpoint(requestDelegate, "/", "Display name!", new[] { metadata });
// Assert
Assert.Equal(endpointBuilder, Assert.Single(builder.Endpoints));
Assert.Equal(invoker, endpointBuilder.Invoker);
Assert.Equal(requestDelegate, endpointBuilder.RequestDelegate);
Assert.Equal("Display name!", endpointBuilder.DisplayName);
Assert.Equal("/", endpointBuilder.RoutePattern.RawText);
Assert.Equal(metadata, Assert.Single(endpointBuilder.Metadata));
@ -73,14 +73,14 @@ namespace Microsoft.AspNetCore.Builder
// Arrange
var metadata = new object();
var builder = new DefaultEndpointDataSourceBuilder();
Func<RequestDelegate, RequestDelegate> invoker = (d) => null;
RequestDelegate requestDelegate = (d) => null;
// Act
var endpointBuilder = builder.MapEndpoint(invoker, RoutePatternFactory.Parse("/"), "Display name!", new[] { metadata });
var endpointBuilder = builder.MapEndpoint(requestDelegate, RoutePatternFactory.Parse("/"), "Display name!", new[] { metadata });
// Assert
Assert.Equal(endpointBuilder, Assert.Single(builder.Endpoints));
Assert.Equal(invoker, endpointBuilder.Invoker);
Assert.Equal(requestDelegate, endpointBuilder.RequestDelegate);
Assert.Equal("Display name!", endpointBuilder.DisplayName);
Assert.Equal("/", endpointBuilder.RoutePattern.RawText);
Assert.Equal(metadata, Assert.Single(endpointBuilder.Metadata));

8
test/Microsoft.AspNetCore.Routing.Tests/Matching/MatcherEndpointBuilderTest.cs
View File

@ -17,18 +17,18 @@ namespace Microsoft.AspNetCore.Routing.Matching
{
const int defaultOrder = 0;
object metadata = new object();
Func<RequestDelegate, RequestDelegate> invoker = (d) => null;
RequestDelegate requestDelegate = (d) => null;
var builder = new MatcherEndpointBuilder(invoker, RoutePatternFactory.Parse("/"), defaultOrder)
var builder = new MatcherEndpointBuilder(requestDelegate, RoutePatternFactory.Parse("/"), defaultOrder)
{
DisplayName = "Display name!",
Metadata = { metadata }
};
var endpoint = Assert.IsType<MatcherEndpoint>(builder.Build());
var endpoint = Assert.IsType<RouteEndpoint>(builder.Build());
Assert.Equal("Display name!", endpoint.DisplayName);
Assert.Equal(defaultOrder, endpoint.Order);
Assert.Equal(invoker, endpoint.Invoker);
Assert.Equal(requestDelegate, endpoint.RequestDelegate);
Assert.Equal("/", endpoint.RoutePattern.RawText);
Assert.Equal(metadata, Assert.Single(endpoint.Metadata));
}