From c68c5befc716daa23ec0481db1b12801afdc3a09 Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Thu, 26 Jul 2018 11:06:54 +1200
Subject: [PATCH] Remove ChangeToken from EndpointDataSource (#662)

---
 .../CompositeEndpointDataSource.cs                     |  2 --
 .../DefaultEndpointDataSource.cs                       |  2 --
 src/Microsoft.AspNetCore.Routing/EndpointDataSource.cs | 10 +---------
 .../CompositeEndpointDataSourceTest.cs                 |  1 -
 .../TestObjects/DynamicEndpointDataSource.cs           |  2 --
 5 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Routing/CompositeEndpointDataSource.cs b/src/Microsoft.AspNetCore.Routing/CompositeEndpointDataSource.cs
index 2e6559817c..a806808d20 100644
--- a/src/Microsoft.AspNetCore.Routing/CompositeEndpointDataSource.cs
+++ b/src/Microsoft.AspNetCore.Routing/CompositeEndpointDataSource.cs
@@ -34,8 +34,6 @@ namespace Microsoft.AspNetCore.Routing
             _lock = new object();
         }
 
-        public override IChangeToken ChangeToken => GetChangeToken();
-
         public override IChangeToken GetChangeToken()
         {
             EnsureInitialized();
diff --git a/src/Microsoft.AspNetCore.Routing/DefaultEndpointDataSource.cs b/src/Microsoft.AspNetCore.Routing/DefaultEndpointDataSource.cs
index 971f499afa..d74369c8b7 100644
--- a/src/Microsoft.AspNetCore.Routing/DefaultEndpointDataSource.cs
+++ b/src/Microsoft.AspNetCore.Routing/DefaultEndpointDataSource.cs
@@ -23,8 +23,6 @@ namespace Microsoft.AspNetCore.Routing
             _endpoints.AddRange(endpoints);
         }
 
-        public override IChangeToken ChangeToken => GetChangeToken();
-
         public override IChangeToken GetChangeToken() => NullChangeToken.Singleton;
 
         public override IReadOnlyList<Endpoint> Endpoints => _endpoints;
diff --git a/src/Microsoft.AspNetCore.Routing/EndpointDataSource.cs b/src/Microsoft.AspNetCore.Routing/EndpointDataSource.cs
index 74c79c3bbb..b5a1c40ebe 100644
--- a/src/Microsoft.AspNetCore.Routing/EndpointDataSource.cs
+++ b/src/Microsoft.AspNetCore.Routing/EndpointDataSource.cs
@@ -8,15 +8,7 @@ namespace Microsoft.AspNetCore.Routing
 {
     public abstract class EndpointDataSource
     {
-        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 IChangeToken GetChangeToken();
 
         public abstract IReadOnlyList<Endpoint> Endpoints { get; }
     }
diff --git a/test/Microsoft.AspNetCore.Routing.Tests/CompositeEndpointDataSourceTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/CompositeEndpointDataSourceTest.cs
index 16a04cc587..0e18453df9 100644
--- a/test/Microsoft.AspNetCore.Routing.Tests/CompositeEndpointDataSourceTest.cs
+++ b/test/Microsoft.AspNetCore.Routing.Tests/CompositeEndpointDataSourceTest.cs
@@ -174,7 +174,6 @@ namespace Microsoft.AspNetCore.Routing
             }
 
             public override IChangeToken GetChangeToken() => _token;
-            public override IChangeToken ChangeToken => GetChangeToken();
             public override IReadOnlyList<Endpoint> Endpoints => Array.Empty<Endpoint>();
         }
     }
diff --git a/test/Microsoft.AspNetCore.Routing.Tests/TestObjects/DynamicEndpointDataSource.cs b/test/Microsoft.AspNetCore.Routing.Tests/TestObjects/DynamicEndpointDataSource.cs
index 79e71babdb..71f45c09c6 100644
--- a/test/Microsoft.AspNetCore.Routing.Tests/TestObjects/DynamicEndpointDataSource.cs
+++ b/test/Microsoft.AspNetCore.Routing.Tests/TestObjects/DynamicEndpointDataSource.cs
@@ -25,8 +25,6 @@ namespace Microsoft.AspNetCore.Routing.TestObjects
 
         public override IChangeToken GetChangeToken() => _changeToken;
 
-        public override IChangeToken ChangeToken => GetChangeToken();
-
         public override IReadOnlyList<Endpoint> Endpoints => _endpoints;
 
         // Trigger change