Skip to content

Commit 26164d0

Browse files
committed
Remove arguments from Initialze on HttpRequest and HttpResponse
1 parent 37df3c1 commit 26164d0

File tree

3 files changed

+14
-17
lines changed

3 files changed

+14
-17
lines changed

src/Http/Http/src/DefaultHttpContext.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public sealed class DefaultHttpContext : HttpContext
2424

2525
private FeatureReferences<FeatureInterfaces> _features;
2626

27-
private DefaultHttpRequest _request;
28-
private DefaultHttpResponse _response;
27+
private readonly DefaultHttpRequest _request;
28+
private readonly DefaultHttpResponse _response;
2929

3030
private DefaultConnectionInfo _connection;
3131
private DefaultWebSocketManager _websockets;
@@ -47,16 +47,15 @@ public DefaultHttpContext(IFeatureCollection features)
4747
public void Initialize(IFeatureCollection features)
4848
{
4949
_features = new FeatureReferences<FeatureInterfaces>(features);
50-
_request.Initialize(this);
51-
_response.Initialize(this);
50+
_request.Initialize();
51+
_response.Initialize();
5252
_connection?.Initialize(features);
5353
_websockets?.Initialize(features);
5454
}
5555

5656
public void Uninitialize()
5757
{
5858
_features = default;
59-
6059
_request.Uninitialize();
6160
_response.Uninitialize();
6261
_connection?.Uninitialize();

src/Http/Http/src/Internal/DefaultHttpRequest.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,22 @@ public sealed class DefaultHttpRequest : HttpRequest
2222
private readonly static Func<IFeatureCollection, IRouteValuesFeature> _newRouteValuesFeature = f => new RouteValuesFeature();
2323
private readonly static Func<HttpContext, IRequestBodyPipeFeature> _newRequestBodyPipeFeature = context => new RequestBodyPipeFeature(context);
2424

25-
private DefaultHttpContext _context;
25+
private readonly DefaultHttpContext _context;
2626
private FeatureReferences<FeatureInterfaces> _features;
2727

2828
public DefaultHttpRequest(DefaultHttpContext context)
2929
{
30-
Initialize(context);
30+
_context = context;
31+
_features = new FeatureReferences<FeatureInterfaces>(_context.Features);
3132
}
3233

33-
public void Initialize(DefaultHttpContext context)
34+
public void Initialize()
3435
{
35-
_context = context;
36-
_features = new FeatureReferences<FeatureInterfaces>(context.Features);
36+
_features = new FeatureReferences<FeatureInterfaces>(_context.Features);
3737
}
3838

3939
public void Uninitialize()
4040
{
41-
_context = null;
4241
_features = default;
4342
}
4443

src/Http/Http/src/Internal/DefaultHttpResponse.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,22 @@ public sealed class DefaultHttpResponse : HttpResponse
1717
private readonly static Func<IFeatureCollection, IResponseCookiesFeature> _newResponseCookiesFeature = f => new ResponseCookiesFeature(f);
1818
private readonly static Func<HttpContext, IResponseBodyPipeFeature> _newResponseBodyPipeFeature = context => new ResponseBodyPipeFeature(context);
1919

20-
private DefaultHttpContext _context;
20+
private readonly DefaultHttpContext _context;
2121
private FeatureReferences<FeatureInterfaces> _features;
2222

2323
public DefaultHttpResponse(DefaultHttpContext context)
2424
{
25-
Initialize(context);
25+
_context = context;
26+
_features = new FeatureReferences<FeatureInterfaces>(_context.Features);
2627
}
2728

28-
public void Initialize(DefaultHttpContext context)
29+
public void Initialize()
2930
{
30-
_context = context;
31-
_features = new FeatureReferences<FeatureInterfaces>(context.Features);
31+
_features = new FeatureReferences<FeatureInterfaces>(_context.Features);
3232
}
3333

3434
public void Uninitialize()
3535
{
36-
_context = null;
3736
_features = default;
3837
}
3938

0 commit comments

Comments
 (0)