Skip to content

Commit c68c5be

Browse files
authored
Remove ChangeToken from EndpointDataSource (#662)
1 parent e0294f1 commit c68c5be

File tree

5 files changed

+1
-16
lines changed

5 files changed

+1
-16
lines changed

src/Microsoft.AspNetCore.Routing/CompositeEndpointDataSource.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ internal CompositeEndpointDataSource(IEnumerable<EndpointDataSource> dataSources
3434
_lock = new object();
3535
}
3636

37-
public override IChangeToken ChangeToken => GetChangeToken();
38-
3937
public override IChangeToken GetChangeToken()
4038
{
4139
EnsureInitialized();

src/Microsoft.AspNetCore.Routing/DefaultEndpointDataSource.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ public DefaultEndpointDataSource(IEnumerable<Endpoint> endpoints)
2323
_endpoints.AddRange(endpoints);
2424
}
2525

26-
public override IChangeToken ChangeToken => GetChangeToken();
27-
2826
public override IChangeToken GetChangeToken() => NullChangeToken.Singleton;
2927

3028
public override IReadOnlyList<Endpoint> Endpoints => _endpoints;

src/Microsoft.AspNetCore.Routing/EndpointDataSource.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,7 @@ namespace Microsoft.AspNetCore.Routing
88
{
99
public abstract class EndpointDataSource
1010
{
11-
public virtual IChangeToken ChangeToken { get; }
12-
13-
// Plan is to replace ChangeToken property with GetChangeToken
14-
// Temporarily have both to avoid breaking MVC
15-
// https://github.com/aspnet/Routing/issues/634
16-
public virtual IChangeToken GetChangeToken()
17-
{
18-
return ChangeToken;
19-
}
11+
public abstract IChangeToken GetChangeToken();
2012

2113
public abstract IReadOnlyList<Endpoint> Endpoints { get; }
2214
}

test/Microsoft.AspNetCore.Routing.Tests/CompositeEndpointDataSourceTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ public CustomEndpointDataSource()
174174
}
175175

176176
public override IChangeToken GetChangeToken() => _token;
177-
public override IChangeToken ChangeToken => GetChangeToken();
178177
public override IReadOnlyList<Endpoint> Endpoints => Array.Empty<Endpoint>();
179178
}
180179
}

test/Microsoft.AspNetCore.Routing.Tests/TestObjects/DynamicEndpointDataSource.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ public DynamicEndpointDataSource(params Endpoint[] endpoints)
2525

2626
public override IChangeToken GetChangeToken() => _changeToken;
2727

28-
public override IChangeToken ChangeToken => GetChangeToken();
29-
3028
public override IReadOnlyList<Endpoint> Endpoints => _endpoints;
3129

3230
// Trigger change

0 commit comments

Comments
 (0)