Remove ChangeToken from EndpointDataSource (#662)
This commit is contained in:
parent
e0294f1d1b
commit
c68c5befc7
|
|
@ -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();
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -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; }
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue