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

Add GetChangeToken to EndpointDataSource (#649)

This commit is contained in:
James Newton-King 2018-07-23 13:46:22 +12:00 committed by GitHub
parent b9df95831d
commit 1e807240ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNetCore.Routing/CompositeEndpointDataSource.cs
View File

@ -69,8 +69,8 @@ namespace Microsoft.AspNetCore.Routing
foreach (var dataSource in _dataSources) foreach (var dataSource in _dataSources)
{ {
Extensions.Primitives.ChangeToken.OnChange( Extensions.Primitives.ChangeToken.OnChange(
() => dataSource.ChangeToken, dataSource.GetChangeToken,
() => HandleChange()); HandleChange);
} }
} }
} }

2
src/Microsoft.AspNetCore.Routing/DataSourceDependentCache.cs
View File

@ -47,7 +47,7 @@ namespace Microsoft.AspNetCore.Routing
{ {
lock (_lock) lock (_lock)
{ {
var changeToken = _dataSource.ChangeToken; var changeToken = _dataSource.GetChangeToken();
_value = _initializeCore(_dataSource.Endpoints); _value = _initializeCore(_dataSource.Endpoints);
changeToken.RegisterChangeCallback(_initializerWithState, null); changeToken.RegisterChangeCallback(_initializerWithState, null);

10
src/Microsoft.AspNetCore.Routing/EndpointDataSource.cs
View File

@ -8,7 +8,15 @@ namespace Microsoft.AspNetCore.Routing
{ {
public abstract class EndpointDataSource public abstract class EndpointDataSource
{ {
public abstract IChangeToken ChangeToken { get; } public virtual IChangeToken ChangeToken { get; }
// Plan is to replace ChangeToken property with GetChangeToken
// Temporarily have both to avoid breaking MVC
// https://github.com/aspnet/Routing/issues/634
public virtual IChangeToken GetChangeToken()
{
return ChangeToken;
}
public abstract IReadOnlyList<Endpoint> Endpoints { get; } public abstract IReadOnlyList<Endpoint> Endpoints { get; }
} }

8
src/Microsoft.AspNetCore.Routing/RouteValuesBasedEndpointFinder.cs
View File

@ -32,8 +32,8 @@ namespace Microsoft.AspNetCore.Routing
// Register for changes in endpoints // Register for changes in endpoints
Extensions.Primitives.ChangeToken.OnChange( Extensions.Primitives.ChangeToken.OnChange(
() => _endpointDataSource.ChangeToken, _endpointDataSource.GetChangeToken,
() => HandleChange()); HandleChange);
} }
public IEnumerable<Endpoint> FindEndpoints(RouteValuesBasedEndpointFinderContext context) public IEnumerable<Endpoint> FindEndpoints(RouteValuesBasedEndpointFinderContext context)
@ -70,8 +70,8 @@ namespace Microsoft.AspNetCore.Routing
// re-register the callback as the change token is one time use only and a new change token // re-register the callback as the change token is one time use only and a new change token
// is produced every time // is produced every time
Extensions.Primitives.ChangeToken.OnChange( Extensions.Primitives.ChangeToken.OnChange(
() => _endpointDataSource.ChangeToken, _endpointDataSource.GetChangeToken,
() => HandleChange()); HandleChange);
} }
private void BuildOutboundMatches() private void BuildOutboundMatches()

6
test/Microsoft.AspNetCore.Routing.Tests/CompositeEndpointDataSourceTest.cs
View File

@ -114,7 +114,7 @@ namespace Microsoft.AspNetCore.Routing
var endpoints = compositeDataSource.Endpoints; var endpoints = compositeDataSource.Endpoints;
// Assert1 // Assert1
var changeToken1 = compositeDataSource.ChangeToken; var changeToken1 = compositeDataSource.GetChangeToken();
var token = Assert.IsType<CancellationChangeToken>(changeToken1); var token = Assert.IsType<CancellationChangeToken>(changeToken1);
Assert.False(token.HasChanged); // initial state Assert.False(token.HasChanged); // initial state
@ -126,7 +126,7 @@ namespace Microsoft.AspNetCore.Routing
// Assert2 // Assert2
Assert.True(changeToken1.HasChanged); // old token is expected to be changed Assert.True(changeToken1.HasChanged); // old token is expected to be changed
var changeToken2 = compositeDataSource.ChangeToken; // new token is in a unchanged state var changeToken2 = compositeDataSource.GetChangeToken(); // new token is in a unchanged state
Assert.NotSame(changeToken2, changeToken1); Assert.NotSame(changeToken2, changeToken1);
token = Assert.IsType<CancellationChangeToken>(changeToken2); token = Assert.IsType<CancellationChangeToken>(changeToken2);
Assert.False(token.HasChanged); Assert.False(token.HasChanged);
@ -139,7 +139,7 @@ namespace Microsoft.AspNetCore.Routing
// Assert2 // Assert2
Assert.True(changeToken2.HasChanged); // old token is expected to be changed Assert.True(changeToken2.HasChanged); // old token is expected to be changed
var changeToken3 = compositeDataSource.ChangeToken; // new token is in a unchanged state var changeToken3 = compositeDataSource.GetChangeToken(); // new token is in a unchanged state
Assert.NotSame(changeToken3, changeToken2); Assert.NotSame(changeToken3, changeToken2);
Assert.NotSame(changeToken3, changeToken1); Assert.NotSame(changeToken3, changeToken1);
token = Assert.IsType<CancellationChangeToken>(changeToken3); token = Assert.IsType<CancellationChangeToken>(changeToken3);