Allow feature cache to be updated+invalidated

benaadams · benaadams · commit e4f47481d4f0 · 2015-12-07T05:26:07.000Z
diff --git a/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs b/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Http.Authentication.Internal
 {
     public class DefaultAuthenticationManager : AuthenticationManager, IFeatureCache
     {
-        private readonly IFeatureCollection _features;
+        private IFeatureCollection _features;
         private int _cachedFeaturesRevision = -1;
 
         private IHttpAuthenticationFeature _authentication;
@@ -29,12 +29,23 @@ void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                _authentication = null;
-                _response = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        public void ReplaceFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+        }
+
+        private void ResetFeatures()
+        {
+            _authentication = null;
+            _response = null;
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         private IHttpAuthenticationFeature HttpAuthenticationFeature
         {
             get
diff --git a/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs b/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNet.Http.Internal
 {
     public class DefaultConnectionInfo : ConnectionInfo, IFeatureCache
     {
-        private readonly IFeatureCollection _features;
+        private IFeatureCollection _features;
         private int _cachedFeaturesRevision = -1;
 
         private IHttpConnectionFeature _connection;
@@ -27,12 +27,23 @@ void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                _connection = null;
-                _tlsConnection = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        public void ReplaceFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+        }
+
+        private void ResetFeatures()
+        {
+            _connection = null;
+            _tlsConnection = null;
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         private IHttpConnectionFeature HttpConnectionFeature
         {
             get
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpContext.cs b/src/Microsoft.AspNet.Http/DefaultHttpContext.cs
@@ -16,17 +16,18 @@ namespace Microsoft.AspNet.Http.Internal
 {
     public class DefaultHttpContext : HttpContext, IFeatureCache
     {
-        private readonly HttpRequest _request;
-        private readonly HttpResponse _response;
-        private ConnectionInfo _connection;
-        private AuthenticationManager _authenticationManager;
+        private readonly DefaultHttpRequest _request;
+        private readonly DefaultHttpResponse _response;
+
+        private DefaultAuthenticationManager _authenticationManager;
+        private DefaultConnectionInfo _connection;
+        private DefaultWebSocketManager _websockets;
 
         private IItemsFeature _items;
         private IServiceProvidersFeature _serviceProviders;
         private IHttpAuthenticationFeature _authentication;
         private IHttpRequestLifetimeFeature _lifetime;
         private ISessionFeature _session;
-        private WebSocketManager _websockets;
 
         private IFeatureCollection _features;
         private int _cachedFeaturesRevision = -1;
@@ -49,15 +50,33 @@ void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision !=_features.Revision)
             {
-                _items = null;
-                _serviceProviders = null;
-                _authentication = null;
-                _lifetime = null;
-                _session = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        public void ReplaceFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+
+            _request.ReplaceFeatures(features);
+            _response.ReplaceFeatures(features);
+
+            _authenticationManager?.ReplaceFeatures(features);
+            _connection?.ReplaceFeatures(features);
+            _websockets?.ReplaceFeatures(features);
+        }
+
+        private void ResetFeatures()
+        {
+            _items = null;
+            _serviceProviders = null;
+            _authentication = null;
+            _lifetime = null;
+            _session = null;
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         IItemsFeature ItemsFeature
         {
             get
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs b/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Http.Internal
     public class DefaultHttpRequest : HttpRequest, IFeatureCache
     {
         private readonly DefaultHttpContext _context;
-        private readonly IFeatureCollection _features;
+        private IFeatureCollection _features;
         private int _cachedFeaturesRevision = -1;
 
         private IHttpRequestFeature _request;
@@ -32,14 +32,25 @@ void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                _request = null;
-                _query = null;
-                _form = null;
-                _cookies = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        public void ReplaceFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+        }
+
+        private void ResetFeatures()
+        {
+            _request = null;
+            _query = null;
+            _form = null;
+            _cookies = null;
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         private IHttpRequestFeature HttpRequestFeature
         {
             get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs b/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs
@@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Http.Internal
     public class DefaultHttpResponse : HttpResponse, IFeatureCache
     {
         private readonly DefaultHttpContext _context;
-        private readonly IFeatureCollection _features;
+        private IFeatureCollection _features;
         private int _cachedFeaturesRevision = -1;
 
         private IHttpResponseFeature _response;
@@ -29,12 +29,23 @@ void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                _response = null;
-                _cookies = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        public void ReplaceFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+        }
+
+        private void ResetFeatures()
+        {
+            _response = null;
+            _cookies = null;
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         private IHttpResponseFeature HttpResponseFeature
         {
             get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }
diff --git a/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs b/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs
@@ -27,12 +27,23 @@ void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                _request = null;
-                _webSockets = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        public void ReplaceFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+        }
+
+        private void ResetFeatures()
+        {
+            _request = null;
+            _webSockets = null;
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         private IHttpRequestFeature HttpRequestFeature
         {
             get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }
diff --git a/src/Microsoft.AspNet.Http/Features/IFeatureCache.cs b/src/Microsoft.AspNet.Http/Features/IFeatureCache.cs
@@ -3,8 +3,9 @@
 
 namespace Microsoft.AspNet.Http.Features
 {
-    internal interface IFeatureCache
+    public interface IFeatureCache
     {
         void CheckFeaturesRevision();
+        void ReplaceFeatures(IFeatureCollection features);
     }
 }
diff --git a/src/Microsoft.AspNet.Http/Features/QueryFeature.cs b/src/Microsoft.AspNet.Http/Features/QueryFeature.cs
@@ -9,7 +9,7 @@ namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class QueryFeature : IQueryFeature, IFeatureCache
     {
-        private readonly IFeatureCollection _features;
+        private IFeatureCollection _features;
         private int _cachedFeaturesRevision = -1;
 
         private IHttpRequestFeature _request;
@@ -41,11 +41,23 @@ void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                _request = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        public void ReplaceFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+        }
+
+        private void ResetFeatures()
+        {
+            _request = null;
+            _parsedValues = null;
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         private IHttpRequestFeature HttpRequestFeature
         {
             get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }
diff --git a/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class RequestCookiesFeature : IRequestCookiesFeature, IFeatureCache
     {
-        private readonly IFeatureCollection _features;
+        private IFeatureCollection _features;
         private int _cachedFeaturesRevision = -1;
 
         private IHttpRequestFeature _request;
@@ -43,11 +43,23 @@ void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                _request = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        public void ReplaceFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+        }
+
+        private void ResetFeatures()
+        {
+            _request = null;
+            _parsedValues = null;
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         private IHttpRequestFeature HttpRequestFeature
         {
             get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }
diff --git a/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs
@@ -7,7 +7,7 @@ namespace Microsoft.AspNet.Http.Features.Internal
 {
     public class ResponseCookiesFeature : IResponseCookiesFeature, IFeatureCache
     {
-        private readonly IFeatureCollection _features;
+        private IFeatureCollection _features;
         private int _cachedFeaturesRevision = -1;
 
         private IHttpResponseFeature _response;
@@ -22,11 +22,23 @@ void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                _response = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        public void ReplaceFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+        }
+
+        private void ResetFeatures()
+        {
+            _response = null;
+            _cookiesCollection = null;
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
         private IHttpResponseFeature HttpResponseFeature
         {
             get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Http.Authentication.Internal`
`14`	`14`	`{`
`15`	`15`	`public class DefaultAuthenticationManager : AuthenticationManager, IFeatureCache`
`16`	`16`	`{`
`17`		`- private readonly IFeatureCollection _features;`
	`17`	`+ private IFeatureCollection _features;`
`18`	`18`	`private int _cachedFeaturesRevision = -1;`
`19`	`19`
`20`	`20`	`private IHttpAuthenticationFeature _authentication;`
`@@ -29,12 +29,23 @@ void IFeatureCache.CheckFeaturesRevision()`
`29`	`29`	`{`
`30`	`30`	`if (_cachedFeaturesRevision != _features.Revision)`
`31`	`31`	`{`
`32`		`- _authentication = null;`
`33`		`- _response = null;`
`34`		`- _cachedFeaturesRevision = _features.Revision;`
	`32`	`+ ResetFeatures();`
`35`	`33`	`}`
`36`	`34`	`}`
`37`	`35`
	`36`	`+ public void ReplaceFeatures(IFeatureCollection features)`
	`37`	`+ {`
	`38`	`+ _features = features;`
	`39`	`+ ResetFeatures();`
	`40`	`+ }`
	`41`	`+`
	`42`	`+ private void ResetFeatures()`
	`43`	`+ {`
	`44`	`+ _authentication = null;`
	`45`	`+ _response = null;`
	`46`	`+ _cachedFeaturesRevision = _features.Revision;`
	`47`	`+ }`
	`48`	`+`
`38`	`49`	`private IHttpAuthenticationFeature HttpAuthenticationFeature`
`39`	`50`	`{`
`40`	`51`	`get`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Microsoft.AspNet.Http.Internal`
`12`	`12`	`{`
`13`	`13`	`public class DefaultConnectionInfo : ConnectionInfo, IFeatureCache`
`14`	`14`	`{`
`15`		`- private readonly IFeatureCollection _features;`
	`15`	`+ private IFeatureCollection _features;`
`16`	`16`	`private int _cachedFeaturesRevision = -1;`
`17`	`17`
`18`	`18`	`private IHttpConnectionFeature _connection;`
`@@ -27,12 +27,23 @@ void IFeatureCache.CheckFeaturesRevision()`
`27`	`27`	`{`
`28`	`28`	`if (_cachedFeaturesRevision != _features.Revision)`
`29`	`29`	`{`
`30`		`- _connection = null;`
`31`		`- _tlsConnection = null;`
`32`		`- _cachedFeaturesRevision = _features.Revision;`
	`30`	`+ ResetFeatures();`
`33`	`31`	`}`
`34`	`32`	`}`
`35`	`33`
	`34`	`+ public void ReplaceFeatures(IFeatureCollection features)`
	`35`	`+ {`
	`36`	`+ _features = features;`
	`37`	`+ ResetFeatures();`
	`38`	`+ }`
	`39`	`+`
	`40`	`+ private void ResetFeatures()`
	`41`	`+ {`
	`42`	`+ _connection = null;`
	`43`	`+ _tlsConnection = null;`
	`44`	`+ _cachedFeaturesRevision = _features.Revision;`
	`45`	`+ }`
	`46`	`+`
`36`	`47`	`private IHttpConnectionFeature HttpConnectionFeature`
`37`	`48`	`{`
`38`	`49`	`get`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Http.Internal`
`13`	`13`	`public class DefaultHttpResponse : HttpResponse, IFeatureCache`
`14`	`14`	`{`
`15`	`15`	`private readonly DefaultHttpContext _context;`
`16`		`- private readonly IFeatureCollection _features;`
	`16`	`+ private IFeatureCollection _features;`
`17`	`17`	`private int _cachedFeaturesRevision = -1;`
`18`	`18`
`19`	`19`	`private IHttpResponseFeature _response;`
`@@ -29,12 +29,23 @@ void IFeatureCache.CheckFeaturesRevision()`
`29`	`29`	`{`
`30`	`30`	`if (_cachedFeaturesRevision != _features.Revision)`
`31`	`31`	`{`
`32`		`- _response = null;`
`33`		`- _cookies = null;`
`34`		`- _cachedFeaturesRevision = _features.Revision;`
	`32`	`+ ResetFeatures();`
`35`	`33`	`}`
`36`	`34`	`}`
`37`	`35`
	`36`	`+ public void ReplaceFeatures(IFeatureCollection features)`
	`37`	`+ {`
	`38`	`+ _features = features;`
	`39`	`+ ResetFeatures();`
	`40`	`+ }`
	`41`	`+`
	`42`	`+ private void ResetFeatures()`
	`43`	`+ {`
	`44`	`+ _response = null;`
	`45`	`+ _cookies = null;`
	`46`	`+ _cachedFeaturesRevision = _features.Revision;`
	`47`	`+ }`
	`48`	`+`
`38`	`49`	`private IHttpResponseFeature HttpResponseFeature`
`39`	`50`	`{`
`40`	`51`	`get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`
`4`	`4`	`namespace Microsoft.AspNet.Http.Features`
`5`	`5`	`{`
`6`		`- internal interface IFeatureCache`
	`6`	`+ public interface IFeatureCache`
`7`	`7`	`{`
`8`	`8`	`void CheckFeaturesRevision();`
	`9`	`+ void ReplaceFeatures(IFeatureCollection features);`
`9`	`10`	`}`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Microsoft.AspNet.Http.Features.Internal`
`9`	`9`	`{`
`10`	`10`	`public class QueryFeature : IQueryFeature, IFeatureCache`
`11`	`11`	`{`
`12`		`- private readonly IFeatureCollection _features;`
	`12`	`+ private IFeatureCollection _features;`
`13`	`13`	`private int _cachedFeaturesRevision = -1;`
`14`	`14`
`15`	`15`	`private IHttpRequestFeature _request;`
`@@ -41,11 +41,23 @@ void IFeatureCache.CheckFeaturesRevision()`
`41`	`41`	`{`
`42`	`42`	`if (_cachedFeaturesRevision != _features.Revision)`
`43`	`43`	`{`
`44`		`- _request = null;`
`45`		`- _cachedFeaturesRevision = _features.Revision;`
	`44`	`+ ResetFeatures();`
`46`	`45`	`}`
`47`	`46`	`}`
`48`	`47`
	`48`	`+ public void ReplaceFeatures(IFeatureCollection features)`
	`49`	`+ {`
	`50`	`+ _features = features;`
	`51`	`+ ResetFeatures();`
	`52`	`+ }`
	`53`	`+`
	`54`	`+ private void ResetFeatures()`
	`55`	`+ {`
	`56`	`+ _request = null;`
	`57`	`+ _parsedValues = null;`
	`58`	`+ _cachedFeaturesRevision = _features.Revision;`
	`59`	`+ }`
	`60`	`+`
`49`	`61`	`private IHttpRequestFeature HttpRequestFeature`
`50`	`62`	`{`
`51`	`63`	`get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Http.Features.Internal`
`11`	`11`	`{`
`12`	`12`	`public class RequestCookiesFeature : IRequestCookiesFeature, IFeatureCache`
`13`	`13`	`{`
`14`		`- private readonly IFeatureCollection _features;`
	`14`	`+ private IFeatureCollection _features;`
`15`	`15`	`private int _cachedFeaturesRevision = -1;`
`16`	`16`
`17`	`17`	`private IHttpRequestFeature _request;`
`@@ -43,11 +43,23 @@ void IFeatureCache.CheckFeaturesRevision()`
`43`	`43`	`{`
`44`	`44`	`if (_cachedFeaturesRevision != _features.Revision)`
`45`	`45`	`{`
`46`		`- _request = null;`
`47`		`- _cachedFeaturesRevision = _features.Revision;`
	`46`	`+ ResetFeatures();`
`48`	`47`	`}`
`49`	`48`	`}`
`50`	`49`
	`50`	`+ public void ReplaceFeatures(IFeatureCollection features)`
	`51`	`+ {`
	`52`	`+ _features = features;`
	`53`	`+ ResetFeatures();`
	`54`	`+ }`
	`55`	`+`
	`56`	`+ private void ResetFeatures()`
	`57`	`+ {`
	`58`	`+ _request = null;`
	`59`	`+ _parsedValues = null;`
	`60`	`+ _cachedFeaturesRevision = _features.Revision;`
	`61`	`+ }`
	`62`	`+`
`51`	`63`	`private IHttpRequestFeature HttpRequestFeature`
`52`	`64`	`{`
`53`	`65`	`get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Microsoft.AspNet.Http.Features.Internal`
`7`	`7`	`{`
`8`	`8`	`public class ResponseCookiesFeature : IResponseCookiesFeature, IFeatureCache`
`9`	`9`	`{`
`10`		`- private readonly IFeatureCollection _features;`
	`10`	`+ private IFeatureCollection _features;`
`11`	`11`	`private int _cachedFeaturesRevision = -1;`
`12`	`12`
`13`	`13`	`private IHttpResponseFeature _response;`
`@@ -22,11 +22,23 @@ void IFeatureCache.CheckFeaturesRevision()`
`22`	`22`	`{`
`23`	`23`	`if (_cachedFeaturesRevision != _features.Revision)`
`24`	`24`	`{`
`25`		`- _response = null;`
`26`		`- _cachedFeaturesRevision = _features.Revision;`
	`25`	`+ ResetFeatures();`
`27`	`26`	`}`
`28`	`27`	`}`
`29`	`28`
	`29`	`+ public void ReplaceFeatures(IFeatureCollection features)`
	`30`	`+ {`
	`31`	`+ _features = features;`
	`32`	`+ ResetFeatures();`
	`33`	`+ }`
	`34`	`+`
	`35`	`+ private void ResetFeatures()`
	`36`	`+ {`
	`37`	`+ _response = null;`
	`38`	`+ _cookiesCollection = null;`
	`39`	`+ _cachedFeaturesRevision = _features.Revision;`
	`40`	`+ }`
	`41`	`+`
`30`	`42`	`private IHttpResponseFeature HttpResponseFeature`
`31`	`43`	`{`
`32`	`44`	`get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }`