Remove ChangeToken from EndpointDataSource (#662)

This commit is contained in:
James Newton-King 2018-07-26 11:06:54 +12:00 committed by GitHub
parent e0294f1d1b
commit c68c5befc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1 additions and 16 deletions

View File

@ -34,8 +34,6 @@ namespace Microsoft.AspNetCore.Routing
_lock = new object(); _lock = new object();
} }
public override IChangeToken ChangeToken => GetChangeToken();
public override IChangeToken GetChangeToken() public override IChangeToken GetChangeToken()
{ {
EnsureInitialized(); EnsureInitialized();

View File

@ -23,8 +23,6 @@ namespace Microsoft.AspNetCore.Routing
_endpoints.AddRange(endpoints); _endpoints.AddRange(endpoints);
} }
public override IChangeToken ChangeToken => GetChangeToken();
public override IChangeToken GetChangeToken() => NullChangeToken.Singleton; public override IChangeToken GetChangeToken() => NullChangeToken.Singleton;
public override IReadOnlyList<Endpoint> Endpoints => _endpoints; public override IReadOnlyList<Endpoint> Endpoints => _endpoints;

View File

@ -8,15 +8,7 @@ namespace Microsoft.AspNetCore.Routing
{ {
public abstract class EndpointDataSource public abstract class EndpointDataSource
{ {
public virtual IChangeToken ChangeToken { get; } public abstract IChangeToken GetChangeToken();
// 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; }
} }

View File

@ -174,7 +174,6 @@ namespace Microsoft.AspNetCore.Routing
} }
public override IChangeToken GetChangeToken() => _token; public override IChangeToken GetChangeToken() => _token;
public override IChangeToken ChangeToken => GetChangeToken();
public override IReadOnlyList<Endpoint> Endpoints => Array.Empty<Endpoint>(); public override IReadOnlyList<Endpoint> Endpoints => Array.Empty<Endpoint>();
} }
} }

View File

@ -25,8 +25,6 @@ namespace Microsoft.AspNetCore.Routing.TestObjects
public override IChangeToken GetChangeToken() => _changeToken; public override IChangeToken GetChangeToken() => _changeToken;
public override IChangeToken ChangeToken => GetChangeToken();
public override IReadOnlyList<Endpoint> Endpoints => _endpoints; public override IReadOnlyList<Endpoint> Endpoints => _endpoints;
// Trigger change // Trigger change