Remove arguments from Initialze on HttpRequest and HttpResponse

dotnet · Jan 9, 2019 · 8dfee5e · 8dfee5e
1 parent f08e8c9
commit 8dfee5e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/src/Http/Http/src/DefaultHttpContext.cs b/src/Http/Http/src/DefaultHttpContext.cs
@@ -24,8 +24,8 @@ public sealed class DefaultHttpContext : HttpContext
 
         private FeatureReferences<FeatureInterfaces> _features;
 
-        private DefaultHttpRequest _request;
-        private DefaultHttpResponse _response;
+        private readonly DefaultHttpRequest _request;
+        private readonly DefaultHttpResponse _response;
 
         private DefaultConnectionInfo _connection;
         private DefaultWebSocketManager _websockets;
@@ -47,16 +47,15 @@ public DefaultHttpContext(IFeatureCollection features)
         public void Initialize(IFeatureCollection features)
         {
             _features = new FeatureReferences<FeatureInterfaces>(features);
-            _request.Initialize(this);
-            _response.Initialize(this);
+            _request.Initialize();
+            _response.Initialize();
             _connection?.Initialize(features);
             _websockets?.Initialize(features);
         }
 
         public void Uninitialize()
         {
             _features = default;
-
             _request.Uninitialize();
             _response.Uninitialize();
             _connection?.Uninitialize();

diff --git a/src/Http/Http/src/Internal/DefaultHttpRequest.cs b/src/Http/Http/src/Internal/DefaultHttpRequest.cs
@@ -20,23 +20,22 @@ public sealed class DefaultHttpRequest : HttpRequest
         private readonly static Func<IFeatureCollection, IRequestCookiesFeature> _newRequestCookiesFeature = f => new RequestCookiesFeature(f);
         private readonly static Func<IFeatureCollection, IRouteValuesFeature> _newRouteValuesFeature = f => new RouteValuesFeature();
 
-        private DefaultHttpContext _context;
+        private readonly DefaultHttpContext _context;
         private FeatureReferences<FeatureInterfaces> _features;
 
         public DefaultHttpRequest(DefaultHttpContext context)
         {
-            Initialize(context);
+            _context = context;
+            _features = new FeatureReferences<FeatureInterfaces>(_context.Features);
         }
 
-        public void Initialize(DefaultHttpContext context)
+        public void Initialize()
         {
-            _context = context;
-            _features = new FeatureReferences<FeatureInterfaces>(context.Features);
+            _features = new FeatureReferences<FeatureInterfaces>(_context.Features);
         }
 
         public void Uninitialize()
         {
-            _context = null;
             _features = default;
         }
 

diff --git a/src/Http/Http/src/Internal/DefaultHttpResponse.cs b/src/Http/Http/src/Internal/DefaultHttpResponse.cs
@@ -15,23 +15,22 @@ public sealed class DefaultHttpResponse : HttpResponse
         private readonly static Func<IFeatureCollection, IHttpResponseFeature> _nullResponseFeature = f => null;
         private readonly static Func<IFeatureCollection, IResponseCookiesFeature> _newResponseCookiesFeature = f => new ResponseCookiesFeature(f);
 
-        private DefaultHttpContext _context;
+        private readonly DefaultHttpContext _context;
         private FeatureReferences<FeatureInterfaces> _features;
 
         public DefaultHttpResponse(DefaultHttpContext context)
         {
-            Initialize(context);
+            _context = context;
+            _features = new FeatureReferences<FeatureInterfaces>(_context.Features);
         }
 
-        public void Initialize(DefaultHttpContext context)
+        public void Initialize()
         {
-            _context = context;
-            _features = new FeatureReferences<FeatureInterfaces>(context.Features);
+            _features = new FeatureReferences<FeatureInterfaces>(_context.Features);
         }
 
         public void Uninitialize()
         {
-            _context = null;
             _features = default;
         }