Avoid branches and other PR feedback

Author: davidfowl

src/Http/Http/src/HttpContextFactory.cs

@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNetCore.Http
@@ -49,7 +50,7 @@ public HttpContext Create(IFeatureCollection featureCollection)
 
         protected virtual HttpContext CreateHttpContext(IFeatureCollection featureCollection)
         {
-            return new DefaultHttpContext(featureCollection);
+            return new ReusableHttpContext(featureCollection);
         }
 
         public void Dispose(HttpContext httpContext)

src/Http/Http/src/Internal/ReusableHttpContext.cs

@@ -30,49 +30,26 @@ public sealed class ReusableHttpContext : HttpContext
 
         public ReusableHttpContext(IFeatureCollection features)
         {
-            Initialize(features);
+            _features = new FeatureReferences<FeatureInterfaces>(features);
+            _request = new ReusableHttpRequest(this);
+            _response = new ReusableHttpResponse(this);
         }
 
         public void Initialize(IFeatureCollection features)
         {
             _features = new FeatureReferences<FeatureInterfaces>(features);
-
-            if (_request is null)
-            {
-                _request = new ReusableHttpRequest(this);
-            }
-            else
-            {
-                _request.Initialize(this);
-            }
-
-            if (_response is null)
-            {
-                _response = new ReusableHttpResponse(this);
-            }
-            else
-            {
-                _response.Initialize(this);
-            }
-
-            // Only set the ConnectionInfo if it was already allocated
-            if (_connection != null)
-            {
-                _connection.Initialize(features);
-            }
-
-            if (_websockets != null)
-            {
-                _websockets.Initialize(features);
-            }
+            _request.Initialize(this);
+            _response.Initialize(this);
+            _connection?.Initialize(features);
+            _websockets?.Initialize(features);
         }
 
         public void Uninitialize()
         {
             _features = default;
 
-            _request?.Uninitialize();
-            _response?.Uninitialize();
+            _request.Uninitialize();
+            _response.Uninitialize();
             _connection?.Uninitialize();
             _websockets?.Uninitialize();
         }
@@ -106,12 +83,7 @@ public void Uninitialize()
         public override HttpResponse Response => _response;
 
         public override ConnectionInfo Connection => _connection ?? (_connection = new ReusableConnectionInfo(_features.Collection));
-
-        /// <summary>
-        /// This is obsolete and will be removed in a future version. 
-        /// The recommended alternative is to use Microsoft.AspNetCore.Authentication.AuthenticationHttpContextExtensions.
-        /// See https://go.microsoft.com/fwlink/?linkid=845470.
-        /// </summary>
+        
         [Obsolete("This is obsolete and will be removed in a future version. The recommended alternative is to use Microsoft.AspNetCore.Authentication.AuthenticationHttpContextExtensions. See https://go.microsoft.com/fwlink/?linkid=845470.")]
         public override AuthenticationManager Authentication => throw new NotSupportedException();
 
@@ -175,8 +147,6 @@ public override ISession Session
             }
         }
 
-
-
         public override void Abort()
         {
             LifetimeFeature.Abort();

src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs

@@ -277,7 +277,7 @@ public CancellationToken RequestAborted
 
         protected HttpResponseHeaders HttpResponseHeaders { get; } = new HttpResponseHeaders();
 
-        internal HttpContext HttpContext => _httpContext;
+        internal ReusableHttpContext HttpContext => _httpContext;
 
         public void InitializeStreams(MessageBody messageBody)
         {