Skip to content

Commit 8dfee5e

Browse files
committed
Remove arguments from Initialze on HttpRequest and HttpResponse
1 parent f08e8c9 commit 8dfee5e

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
@@ -20,23 +20,22 @@ public sealed class DefaultHttpRequest : HttpRequest
2020
private readonly static Func<IFeatureCollection, IRequestCookiesFeature> _newRequestCookiesFeature = f => new RequestCookiesFeature(f);
2121
private readonly static Func<IFeatureCollection, IRouteValuesFeature> _newRouteValuesFeature = f => new RouteValuesFeature();
2222

23-
private DefaultHttpContext _context;
23+
private readonly DefaultHttpContext _context;
2424
private FeatureReferences<FeatureInterfaces> _features;
2525

2626
public DefaultHttpRequest(DefaultHttpContext context)
2727
{
28-
Initialize(context);
28+
_context = context;
29+
_features = new FeatureReferences<FeatureInterfaces>(_context.Features);
2930
}
3031

31-
public void Initialize(DefaultHttpContext context)
32+
public void Initialize()
3233
{
33-
_context = context;
34-
_features = new FeatureReferences<FeatureInterfaces>(context.Features);
34+
_features = new FeatureReferences<FeatureInterfaces>(_context.Features);
3535
}
3636

3737
public void Uninitialize()
3838
{
39-
_context = null;
4039
_features = default;
4140
}
4241

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,22 @@ public sealed class DefaultHttpResponse : HttpResponse
1515
private readonly static Func<IFeatureCollection, IHttpResponseFeature> _nullResponseFeature = f => null;
1616
private readonly static Func<IFeatureCollection, IResponseCookiesFeature> _newResponseCookiesFeature = f => new ResponseCookiesFeature(f);
1717

18-
private DefaultHttpContext _context;
18+
private readonly DefaultHttpContext _context;
1919
private FeatureReferences<FeatureInterfaces> _features;
2020

2121
public DefaultHttpResponse(DefaultHttpContext context)
2222
{
23-
Initialize(context);
23+
_context = context;
24+
_features = new FeatureReferences<FeatureInterfaces>(_context.Features);
2425
}
2526

26-
public void Initialize(DefaultHttpContext context)
27+
public void Initialize()
2728
{
28-
_context = context;
29-
_features = new FeatureReferences<FeatureInterfaces>(context.Features);
29+
_features = new FeatureReferences<FeatureInterfaces>(_context.Features);
3030
}
3131

3232
public void Uninitialize()
3333
{
34-
_context = null;
3534
_features = default;
3635
}
3736

0 commit comments

Comments
 (0)