Expose IFeatureCache directly, rather than casting

benaadams · benaadams · commit 1d6fcaf26371 · 2015-12-07T00:17:01.000Z
diff --git a/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs b/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs
@@ -25,15 +25,15 @@ public DefaultAuthenticationManager(IFeatureCollection features)
             _features = features;
         }
 
-        void IFeatureCache.CheckFeaturesRevision()
+        public void CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
                 ResetFeatures();
             }
         }
 
-        void IFeatureCache.ReplaceFeatures(IFeatureCollection features)
+        public void ReplaceFeatures(IFeatureCollection features)
         {
             _features = features;
             ResetFeatures();
diff --git a/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs b/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs
@@ -23,15 +23,15 @@ public DefaultConnectionInfo(IFeatureCollection features)
             _features = features;
         }
 
-        void IFeatureCache.CheckFeaturesRevision()
+        public void CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
                 ResetFeatures();
             }
         }
 
-        void IFeatureCache.ReplaceFeatures(IFeatureCollection features)
+        public void ReplaceFeatures(IFeatureCollection features)
         {
             _features = features;
             ResetFeatures();
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpContext.cs b/src/Microsoft.AspNet.Http/DefaultHttpContext.cs
@@ -16,12 +16,12 @@ namespace Microsoft.AspNet.Http.Internal
 {
     public class DefaultHttpContext : HttpContext, IFeatureCache
     {
-        private readonly HttpRequest _request;
-        private readonly HttpResponse _response;
+        private readonly DefaultHttpRequest _request;
+        private readonly DefaultHttpResponse _response;
 
-        private AuthenticationManager _authenticationManager;
-        private ConnectionInfo _connection;
-        private WebSocketManager _websockets;
+        private DefaultAuthenticationManager _authenticationManager;
+        private DefaultConnectionInfo _connection;
+        private DefaultWebSocketManager _websockets;
 
         private IItemsFeature _items;
         private IServiceProvidersFeature _serviceProviders;
@@ -46,25 +46,25 @@ public DefaultHttpContext(IFeatureCollection features)
             _response = new DefaultHttpResponse(this, features);
         }
 
-        void IFeatureCache.CheckFeaturesRevision()
+        public void CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision !=_features.Revision)
             {
                 ResetFeatures();
             }
         }
 
-        void IFeatureCache.ReplaceFeatures(IFeatureCollection features)
+        public void ReplaceFeatures(IFeatureCollection features)
         {
             _features = features;
             ResetFeatures();
 
-            ((IFeatureCache)_request).ReplaceFeatures(features);
-            ((IFeatureCache)_response).ReplaceFeatures(features);
+            _request.ReplaceFeatures(features);
+            _response.ReplaceFeatures(features);
 
-            ((IFeatureCache)_authenticationManager)?.ReplaceFeatures(features);
-            ((IFeatureCache)_connection)?.ReplaceFeatures(features);
-            ((IFeatureCache)_websockets)?.ReplaceFeatures(features);
+            _authenticationManager?.ReplaceFeatures(features);
+            _connection?.ReplaceFeatures(features);
+            _websockets?.ReplaceFeatures(features);
         }
 
         private void ResetFeatures()
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs b/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs
@@ -28,15 +28,15 @@ public DefaultHttpRequest(DefaultHttpContext context, IFeatureCollection feature
             _features = features;
         }
 
-        void IFeatureCache.CheckFeaturesRevision()
+        public void CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
                 ResetFeatures();
             }
         }
 
-        void IFeatureCache.ReplaceFeatures(IFeatureCollection features)
+        public void ReplaceFeatures(IFeatureCollection features)
         {
             _features = features;
             ResetFeatures();
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs b/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs
@@ -25,15 +25,15 @@ public DefaultHttpResponse(DefaultHttpContext context, IFeatureCollection featur
             _features = features;
         }
 
-        void IFeatureCache.CheckFeaturesRevision()
+        public void CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
                 ResetFeatures();
             }
         }
 
-        void IFeatureCache.ReplaceFeatures(IFeatureCollection features)
+        public void ReplaceFeatures(IFeatureCollection features)
         {
             _features = features;
             ResetFeatures();
diff --git a/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs b/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs
@@ -23,15 +23,15 @@ public DefaultWebSocketManager(IFeatureCollection features)
             _features = features;
         }
 
-        void IFeatureCache.CheckFeaturesRevision()
+        public void CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
                 ResetFeatures();
             }
         }
 
-        void IFeatureCache.ReplaceFeatures(IFeatureCollection features)
+        public void ReplaceFeatures(IFeatureCollection features)
         {
             _features = features;
             ResetFeatures();
diff --git a/src/Microsoft.AspNet.Http/Features/QueryFeature.cs b/src/Microsoft.AspNet.Http/Features/QueryFeature.cs
@@ -37,15 +37,15 @@ public QueryFeature(IFeatureCollection features)
             _features = features;
         }
 
-        void IFeatureCache.CheckFeaturesRevision()
+        public void CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
                 ResetFeatures();
             }
         }
 
-        void IFeatureCache.ReplaceFeatures(IFeatureCollection features)
+        public void ReplaceFeatures(IFeatureCollection features)
         {
             _features = features;
             ResetFeatures();
diff --git a/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs
@@ -39,15 +39,15 @@ public RequestCookiesFeature(IFeatureCollection features)
             _features = features;
         }
 
-        void IFeatureCache.CheckFeaturesRevision()
+        public void CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
                 ResetFeatures();
             }
         }
 
-        void IFeatureCache.ReplaceFeatures(IFeatureCollection features)
+        public void ReplaceFeatures(IFeatureCollection features)
         {
             _features = features;
             ResetFeatures();
diff --git a/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs
@@ -18,15 +18,15 @@ public ResponseCookiesFeature(IFeatureCollection features)
             _features = features;
         }
 
-        void IFeatureCache.CheckFeaturesRevision()
+        public void CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
                 ResetFeatures();
             }
         }
 
-        void IFeatureCache.ReplaceFeatures(IFeatureCollection features)
+        public void ReplaceFeatures(IFeatureCollection features)
         {
             _features = features;
             ResetFeatures();

Original file line number	Diff line number	Diff line change
`@@ -25,15 +25,15 @@ public DefaultAuthenticationManager(IFeatureCollection features)`
`25`	`25`	`_features = features;`
`26`	`26`	`}`
`27`	`27`
`28`		`- void IFeatureCache.CheckFeaturesRevision()`
	`28`	`+ public void CheckFeaturesRevision()`
`29`	`29`	`{`
`30`	`30`	`if (_cachedFeaturesRevision != _features.Revision)`
`31`	`31`	`{`
`32`	`32`	`ResetFeatures();`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- void IFeatureCache.ReplaceFeatures(IFeatureCollection features)`
	`36`	`+ public void ReplaceFeatures(IFeatureCollection features)`
`37`	`37`	`{`
`38`	`38`	`_features = features;`
`39`	`39`	`ResetFeatures();`
Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,15 @@ public DefaultConnectionInfo(IFeatureCollection features)`
`23`	`23`	`_features = features;`
`24`	`24`	`}`
`25`	`25`
`26`		`- void IFeatureCache.CheckFeaturesRevision()`
	`26`	`+ public void CheckFeaturesRevision()`
`27`	`27`	`{`
`28`	`28`	`if (_cachedFeaturesRevision != _features.Revision)`
`29`	`29`	`{`
`30`	`30`	`ResetFeatures();`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`		`- void IFeatureCache.ReplaceFeatures(IFeatureCollection features)`
	`34`	`+ public void ReplaceFeatures(IFeatureCollection features)`
`35`	`35`	`{`
`36`	`36`	`_features = features;`
`37`	`37`	`ResetFeatures();`
Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,12 @@ namespace Microsoft.AspNet.Http.Internal`
`16`	`16`	`{`
`17`	`17`	`public class DefaultHttpContext : HttpContext, IFeatureCache`
`18`	`18`	`{`
`19`		`- private readonly HttpRequest _request;`
`20`		`- private readonly HttpResponse _response;`
	`19`	`+ private readonly DefaultHttpRequest _request;`
	`20`	`+ private readonly DefaultHttpResponse _response;`
`21`	`21`
`22`		`- private AuthenticationManager _authenticationManager;`
`23`		`- private ConnectionInfo _connection;`
`24`		`- private WebSocketManager _websockets;`
	`22`	`+ private DefaultAuthenticationManager _authenticationManager;`
	`23`	`+ private DefaultConnectionInfo _connection;`
	`24`	`+ private DefaultWebSocketManager _websockets;`
`25`	`25`
`26`	`26`	`private IItemsFeature _items;`
`27`	`27`	`private IServiceProvidersFeature _serviceProviders;`
`@@ -46,25 +46,25 @@ public DefaultHttpContext(IFeatureCollection features)`
`46`	`46`	`_response = new DefaultHttpResponse(this, features);`
`47`	`47`	`}`
`48`	`48`
`49`		`- void IFeatureCache.CheckFeaturesRevision()`
	`49`	`+ public void CheckFeaturesRevision()`
`50`	`50`	`{`
`51`	`51`	`if (_cachedFeaturesRevision !=_features.Revision)`
`52`	`52`	`{`
`53`	`53`	`ResetFeatures();`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`		`- void IFeatureCache.ReplaceFeatures(IFeatureCollection features)`
	`57`	`+ public void ReplaceFeatures(IFeatureCollection features)`
`58`	`58`	`{`
`59`	`59`	`_features = features;`
`60`	`60`	`ResetFeatures();`
`61`	`61`
`62`		`- ((IFeatureCache)_request).ReplaceFeatures(features);`
`63`		`- ((IFeatureCache)_response).ReplaceFeatures(features);`
	`62`	`+ _request.ReplaceFeatures(features);`
	`63`	`+ _response.ReplaceFeatures(features);`
`64`	`64`
`65`		`- ((IFeatureCache)_authenticationManager)?.ReplaceFeatures(features);`
`66`		`- ((IFeatureCache)_connection)?.ReplaceFeatures(features);`
`67`		`- ((IFeatureCache)_websockets)?.ReplaceFeatures(features);`
	`65`	`+ _authenticationManager?.ReplaceFeatures(features);`
	`66`	`+ _connection?.ReplaceFeatures(features);`
	`67`	`+ _websockets?.ReplaceFeatures(features);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`private void ResetFeatures()`
Original file line number	Diff line number	Diff line change
`@@ -28,15 +28,15 @@ public DefaultHttpRequest(DefaultHttpContext context, IFeatureCollection feature`
`28`	`28`	`_features = features;`
`29`	`29`	`}`
`30`	`30`
`31`		`- void IFeatureCache.CheckFeaturesRevision()`
	`31`	`+ public void CheckFeaturesRevision()`
`32`	`32`	`{`
`33`	`33`	`if (_cachedFeaturesRevision != _features.Revision)`
`34`	`34`	`{`
`35`	`35`	`ResetFeatures();`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`- void IFeatureCache.ReplaceFeatures(IFeatureCollection features)`
	`39`	`+ public void ReplaceFeatures(IFeatureCollection features)`
`40`	`40`	`{`
`41`	`41`	`_features = features;`
`42`	`42`	`ResetFeatures();`
Original file line number	Diff line number	Diff line change
`@@ -25,15 +25,15 @@ public DefaultHttpResponse(DefaultHttpContext context, IFeatureCollection featur`
`25`	`25`	`_features = features;`
`26`	`26`	`}`
`27`	`27`
`28`		`- void IFeatureCache.CheckFeaturesRevision()`
	`28`	`+ public void CheckFeaturesRevision()`
`29`	`29`	`{`
`30`	`30`	`if (_cachedFeaturesRevision != _features.Revision)`
`31`	`31`	`{`
`32`	`32`	`ResetFeatures();`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- void IFeatureCache.ReplaceFeatures(IFeatureCollection features)`
	`36`	`+ public void ReplaceFeatures(IFeatureCollection features)`
`37`	`37`	`{`
`38`	`38`	`_features = features;`
`39`	`39`	`ResetFeatures();`
Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,15 @@ public DefaultWebSocketManager(IFeatureCollection features)`
`23`	`23`	`_features = features;`
`24`	`24`	`}`
`25`	`25`
`26`		`- void IFeatureCache.CheckFeaturesRevision()`
	`26`	`+ public void CheckFeaturesRevision()`
`27`	`27`	`{`
`28`	`28`	`if (_cachedFeaturesRevision != _features.Revision)`
`29`	`29`	`{`
`30`	`30`	`ResetFeatures();`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`		`- void IFeatureCache.ReplaceFeatures(IFeatureCollection features)`
	`34`	`+ public void ReplaceFeatures(IFeatureCollection features)`
`35`	`35`	`{`
`36`	`36`	`_features = features;`
`37`	`37`	`ResetFeatures();`
Original file line number	Diff line number	Diff line change
`@@ -37,15 +37,15 @@ public QueryFeature(IFeatureCollection features)`
`37`	`37`	`_features = features;`
`38`	`38`	`}`
`39`	`39`
`40`		`- void IFeatureCache.CheckFeaturesRevision()`
	`40`	`+ public void CheckFeaturesRevision()`
`41`	`41`	`{`
`42`	`42`	`if (_cachedFeaturesRevision != _features.Revision)`
`43`	`43`	`{`
`44`	`44`	`ResetFeatures();`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`- void IFeatureCache.ReplaceFeatures(IFeatureCollection features)`
	`48`	`+ public void ReplaceFeatures(IFeatureCollection features)`
`49`	`49`	`{`
`50`	`50`	`_features = features;`
`51`	`51`	`ResetFeatures();`
Original file line number	Diff line number	Diff line change
`@@ -39,15 +39,15 @@ public RequestCookiesFeature(IFeatureCollection features)`
`39`	`39`	`_features = features;`
`40`	`40`	`}`
`41`	`41`
`42`		`- void IFeatureCache.CheckFeaturesRevision()`
	`42`	`+ public void CheckFeaturesRevision()`
`43`	`43`	`{`
`44`	`44`	`if (_cachedFeaturesRevision != _features.Revision)`
`45`	`45`	`{`
`46`	`46`	`ResetFeatures();`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`- void IFeatureCache.ReplaceFeatures(IFeatureCollection features)`
	`50`	`+ public void ReplaceFeatures(IFeatureCollection features)`
`51`	`51`	`{`
`52`	`52`	`_features = features;`
`53`	`53`	`ResetFeatures();`
Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,15 @@ public ResponseCookiesFeature(IFeatureCollection features)`
`18`	`18`	`_features = features;`
`19`	`19`	`}`
`20`	`20`
`21`		`- void IFeatureCache.CheckFeaturesRevision()`
	`21`	`+ public void CheckFeaturesRevision()`
`22`	`22`	`{`
`23`	`23`	`if (_cachedFeaturesRevision != _features.Revision)`
`24`	`24`	`{`
`25`	`25`	`ResetFeatures();`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`- void IFeatureCache.ReplaceFeatures(IFeatureCollection features)`
	`29`	`+ public void ReplaceFeatures(IFeatureCollection features)`
`30`	`30`	`{`
`31`	`31`	`_features = features;`
`32`	`32`	`ResetFeatures();`