Allow feature cache to be updated+invalidated

benaadams · benaadams · commit cc549e253c4d · 2015-12-12T13:54:00.000Z
diff --git a/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs b/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs
@@ -14,27 +14,43 @@ 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;
-        private IHttpResponseFeature _response;
 
         public DefaultAuthenticationManager(IFeatureCollection features)
         {
             _features = features;
+            ((IFeatureCache)this).SetFeaturesRevision();
         }
 
         void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                _authentication = null;
-                _response = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        void IFeatureCache.SetFeaturesRevision()
+        {
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
+        public void UpdateFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+        }
+
+        private void ResetFeatures()
+        {
+            _authentication = null;
+
+            ((IFeatureCache)this).SetFeaturesRevision();
+        }
+
         private IHttpAuthenticationFeature HttpAuthenticationFeature
         {
             get
@@ -47,11 +63,6 @@ private IHttpAuthenticationFeature HttpAuthenticationFeature
             }
         }
 
-        private IHttpResponseFeature HttpResponseFeature
-        {
-            get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }
-        }
-
         public override IEnumerable<AuthenticationDescription> GetAuthenticationSchemes()
         {
             var handler = HttpAuthenticationFeature.Handler;
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;
@@ -21,18 +21,36 @@ public class DefaultConnectionInfo : ConnectionInfo, IFeatureCache
         public DefaultConnectionInfo(IFeatureCollection features)
         {
             _features = features;
+            ((IFeatureCache)this).SetFeaturesRevision();
         }
 
         void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                _connection = null;
-                _tlsConnection = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        void IFeatureCache.SetFeaturesRevision()
+        {
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
+        public void UpdateFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+        }
+
+        private void ResetFeatures()
+        {
+            _connection = null;
+            _tlsConnection = null;
+
+            ((IFeatureCache)this).SetFeaturesRevision();
+        }
+
         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;
@@ -36,28 +37,54 @@ public DefaultHttpContext()
         {
             _features.Set<IHttpRequestFeature>(new HttpRequestFeature());
             _features.Set<IHttpResponseFeature>(new HttpResponseFeature());
+            ((IFeatureCache)this).SetFeaturesRevision();
         }
 
         public DefaultHttpContext(IFeatureCollection features)
         {
             _features = features;
             _request = new DefaultHttpRequest(this, features);
             _response = new DefaultHttpResponse(this, features);
+            ((IFeatureCache)this).SetFeaturesRevision();
         }
 
         void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision !=_features.Revision)
             {
-                _items = null;
-                _serviceProviders = null;
-                _authentication = null;
-                _lifetime = null;
-                _session = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        void IFeatureCache.SetFeaturesRevision()
+        {
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
+        public void UpdateFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+
+            _request.UpdateFeatures(features);
+            _response.UpdateFeatures(features);
+
+            _authenticationManager?.UpdateFeatures(features);
+            _connection?.UpdateFeatures(features);
+            _websockets?.UpdateFeatures(features);
+        }
+
+        private void ResetFeatures()
+        {
+            _items = null;
+            _serviceProviders = null;
+            _authentication = null;
+            _lifetime = null;
+            _session = null;
+
+            ((IFeatureCache)this).SetFeaturesRevision();
+        }
+
         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;
@@ -26,20 +26,38 @@ public DefaultHttpRequest(DefaultHttpContext context, IFeatureCollection feature
         {
             _context = context;
             _features = features;
+            ((IFeatureCache)this).SetFeaturesRevision();
         }
 
         void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                _request = null;
-                _query = null;
-                _form = null;
-                _cookies = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        void IFeatureCache.SetFeaturesRevision()
+        {
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
+        public void UpdateFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+        }
+
+        private void ResetFeatures()
+        {
+            _request = null;
+            _query = null;
+            _form = null;
+            _cookies = null;
+
+            ((IFeatureCache)this).SetFeaturesRevision();
+        }
+
         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;
@@ -23,18 +23,36 @@ public DefaultHttpResponse(DefaultHttpContext context, IFeatureCollection featur
         {
             _context = context;
             _features = features;
+            ((IFeatureCache)this).SetFeaturesRevision();
         }
 
         void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                _response = null;
-                _cookies = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        void IFeatureCache.SetFeaturesRevision()
+        {
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
+        public void UpdateFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+        }
+
+        private void ResetFeatures()
+        {
+            _response = null;
+            _cookies = null;
+
+            ((IFeatureCache)this).SetFeaturesRevision();
+        }
+
         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
@@ -21,18 +21,36 @@ public class DefaultWebSocketManager : WebSocketManager, IFeatureCache
         public DefaultWebSocketManager(IFeatureCollection features)
         {
             _features = features;
+            ((IFeatureCache)this).SetFeaturesRevision();
         }
 
         void IFeatureCache.CheckFeaturesRevision()
         {
             if (_cachedFeaturesRevision != _features.Revision)
             {
-                _request = null;
-                _webSockets = null;
-                _cachedFeaturesRevision = _features.Revision;
+                ResetFeatures();
             }
         }
 
+        void IFeatureCache.SetFeaturesRevision()
+        {
+            _cachedFeaturesRevision = _features.Revision;
+        }
+
+        public void UpdateFeatures(IFeatureCollection features)
+        {
+            _features = features;
+            ResetFeatures();
+        }
+
+        private void ResetFeatures()
+        {
+            _request = null;
+            _webSockets = null;
+
+            ((IFeatureCache)this).SetFeaturesRevision();
+        }
+
         private IHttpRequestFeature HttpRequestFeature
         {
             get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }
diff --git a/src/Microsoft.AspNet.Http/Features/FeatureHelpers.cs b/src/Microsoft.AspNet.Http/Features/FeatureHelpers.cs
@@ -56,9 +56,10 @@ public static T GetOrCreateAndCache<T>(
                 if (obj == null)
                 {
                     obj = factory();
-                    cachedObject = obj;
-                    features.Set(obj);
                 }
+                cachedObject = obj;
+                features.Set(obj);
+                cache.SetFeaturesRevision();
             }
             return obj;
         }
@@ -79,9 +80,10 @@ public static T GetOrCreateAndCache<T>(
                 if (obj == null)
                 {
                     obj = factory(features);
-                    cachedObject = obj;
-                    features.Set(obj);
                 }
+                cachedObject = obj;
+                features.Set(obj);
+                cache.SetFeaturesRevision();
             }
             return obj;
         }
@@ -103,9 +105,10 @@ public static T GetOrCreateAndCache<T>(
                 if (obj == null)
                 {
                     obj = factory(request);
-                    cachedObject = obj;
-                    features.Set(obj);
                 }
+                cachedObject = obj;
+                features.Set(obj);
+                cache.SetFeaturesRevision();
             }
             return obj;
         }
diff --git a/src/Microsoft.AspNet.Http/Features/IFeatureCache.cs b/src/Microsoft.AspNet.Http/Features/IFeatureCache.cs
@@ -6,5 +6,6 @@ namespace Microsoft.AspNet.Http.Features
     internal interface IFeatureCache
     {
         void CheckFeaturesRevision();
+        void SetFeaturesRevision();
     }
 }
diff --git a/src/Microsoft.AspNet.Http/Features/QueryFeature.cs b/src/Microsoft.AspNet.Http/Features/QueryFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs
diff --git a/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs
diff --git a/test/Microsoft.AspNet.Http.Tests/DefaultHttpContextTests.cs b/test/Microsoft.AspNet.Http.Tests/DefaultHttpContextTests.cs

Original file line number	Diff line number	Diff line change
`@@ -14,27 +14,43 @@ 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;`
`21`		`- private IHttpResponseFeature _response;`
`22`	`21`
`23`	`22`	`public DefaultAuthenticationManager(IFeatureCollection features)`
`24`	`23`	`{`
`25`	`24`	`_features = features;`
	`25`	`+ ((IFeatureCache)this).SetFeaturesRevision();`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`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`	`+ void IFeatureCache.SetFeaturesRevision()`
	`37`	`+ {`
	`38`	`+ _cachedFeaturesRevision = _features.Revision;`
	`39`	`+ }`
	`40`	`+`
	`41`	`+ public void UpdateFeatures(IFeatureCollection features)`
	`42`	`+ {`
	`43`	`+ _features = features;`
	`44`	`+ ResetFeatures();`
	`45`	`+ }`
	`46`	`+`
	`47`	`+ private void ResetFeatures()`
	`48`	`+ {`
	`49`	`+ _authentication = null;`
	`50`	`+`
	`51`	`+ ((IFeatureCache)this).SetFeaturesRevision();`
	`52`	`+ }`
	`53`	`+`
`38`	`54`	`private IHttpAuthenticationFeature HttpAuthenticationFeature`
`39`	`55`	`{`
`40`	`56`	`get`
`@@ -47,11 +63,6 @@ private IHttpAuthenticationFeature HttpAuthenticationFeature`
`47`	`63`	`}`
`48`	`64`	`}`
`49`	`65`
`50`		`- private IHttpResponseFeature HttpResponseFeature`
`51`		`- {`
`52`		`- get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }`
`53`		`- }`
`54`		`-`
`55`	`66`	`public override IEnumerable<AuthenticationDescription> GetAuthenticationSchemes()`
`56`	`67`	`{`
`57`	`68`	`var handler = HttpAuthenticationFeature.Handler;`
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;`
`@@ -21,18 +21,36 @@ public class DefaultConnectionInfo : ConnectionInfo, IFeatureCache`
`21`	`21`	`public DefaultConnectionInfo(IFeatureCollection features)`
`22`	`22`	`{`
`23`	`23`	`_features = features;`
	`24`	`+ ((IFeatureCache)this).SetFeaturesRevision();`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`void IFeatureCache.CheckFeaturesRevision()`
`27`	`28`	`{`
`28`	`29`	`if (_cachedFeaturesRevision != _features.Revision)`
`29`	`30`	`{`
`30`		`- _connection = null;`
`31`		`- _tlsConnection = null;`
`32`		`- _cachedFeaturesRevision = _features.Revision;`
	`31`	`+ ResetFeatures();`
`33`	`32`	`}`
`34`	`33`	`}`
`35`	`34`
	`35`	`+ void IFeatureCache.SetFeaturesRevision()`
	`36`	`+ {`
	`37`	`+ _cachedFeaturesRevision = _features.Revision;`
	`38`	`+ }`
	`39`	`+`
	`40`	`+ public void UpdateFeatures(IFeatureCollection features)`
	`41`	`+ {`
	`42`	`+ _features = features;`
	`43`	`+ ResetFeatures();`
	`44`	`+ }`
	`45`	`+`
	`46`	`+ private void ResetFeatures()`
	`47`	`+ {`
	`48`	`+ _connection = null;`
	`49`	`+ _tlsConnection = null;`
	`50`	`+`
	`51`	`+ ((IFeatureCache)this).SetFeaturesRevision();`
	`52`	`+ }`
	`53`	`+`
`36`	`54`	`private IHttpConnectionFeature HttpConnectionFeature`
`37`	`55`	`{`
`38`	`56`	`get`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,10 @@ public static T GetOrCreateAndCache<T>(`
`56`	`56`	`if (obj == null)`
`57`	`57`	`{`
`58`	`58`	`obj = factory();`
`59`		`- cachedObject = obj;`
`60`		`- features.Set(obj);`
`61`	`59`	`}`
	`60`	`+ cachedObject = obj;`
	`61`	`+ features.Set(obj);`
	`62`	`+ cache.SetFeaturesRevision();`
`62`	`63`	`}`
`63`	`64`	`return obj;`
`64`	`65`	`}`
`@@ -79,9 +80,10 @@ public static T GetOrCreateAndCache<T>(`
`79`	`80`	`if (obj == null)`
`80`	`81`	`{`
`81`	`82`	`obj = factory(features);`
`82`		`- cachedObject = obj;`
`83`		`- features.Set(obj);`
`84`	`83`	`}`
	`84`	`+ cachedObject = obj;`
	`85`	`+ features.Set(obj);`
	`86`	`+ cache.SetFeaturesRevision();`
`85`	`87`	`}`
`86`	`88`	`return obj;`
`87`	`89`	`}`
`@@ -103,9 +105,10 @@ public static T GetOrCreateAndCache<T>(`
`103`	`105`	`if (obj == null)`
`104`	`106`	`{`
`105`	`107`	`obj = factory(request);`
`106`		`- cachedObject = obj;`
`107`		`- features.Set(obj);`
`108`	`108`	`}`
	`109`	`+ cachedObject = obj;`
	`110`	`+ features.Set(obj);`
	`111`	`+ cache.SetFeaturesRevision();`
`109`	`112`	`}`
`110`	`113`	`return obj;`
`111`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,6 @@ namespace Microsoft.AspNet.Http.Features`
`6`	`6`	`internal interface IFeatureCache`
`7`	`7`	`{`
`8`	`8`	`void CheckFeaturesRevision();`
	`9`	`+ void SetFeaturesRevision();`
`9`	`10`	`}`
`10`	`11`	`}`