Rename HTTP request+response impl, drop the "impl"
This commit is contained in:
parent
90409711b4
commit
d3a3d93796
4 changed files with 13 additions and 11 deletions
|
@ -20,3 +20,5 @@ single type argument pointing to the underlying request/response type,
|
||||||
respectively.
|
respectively.
|
||||||
* `RequestContext.io` and `ResponseContext.io` are now permanently
|
* `RequestContext.io` and `ResponseContext.io` are now permanently
|
||||||
gone.
|
gone.
|
||||||
|
* `HttpRequestContextImpl` and `HttpResponseContextImpl` were renamed to
|
||||||
|
`HttpRequestContext` and `HttpResponseContext`.
|
|
@ -340,10 +340,10 @@ class AngelHttp {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<HttpRequestContextImpl> createRequestContext(HttpRequest request) {
|
Future<HttpRequestContext> createRequestContext(HttpRequest request) {
|
||||||
var path = request.uri.path.replaceAll(_straySlashes, '');
|
var path = request.uri.path.replaceAll(_straySlashes, '');
|
||||||
if (path.length == 0) path = '/';
|
if (path.length == 0) path = '/';
|
||||||
return HttpRequestContextImpl.from(request, app, path).then((req) {
|
return HttpRequestContext.from(request, app, path).then((req) {
|
||||||
if (_pool != null) req.inject(PoolResource, _pool.request());
|
if (_pool != null) req.inject(PoolResource, _pool.request());
|
||||||
if (app.injections.isNotEmpty) app.injections.forEach(req.inject);
|
if (app.injections.isNotEmpty) app.injections.forEach(req.inject);
|
||||||
return req;
|
return req;
|
||||||
|
@ -352,8 +352,8 @@ class AngelHttp {
|
||||||
|
|
||||||
Future<ResponseContext> createResponseContext(HttpResponse response,
|
Future<ResponseContext> createResponseContext(HttpResponse response,
|
||||||
[RequestContext correspondingRequest]) =>
|
[RequestContext correspondingRequest]) =>
|
||||||
new Future<ResponseContext>.value(new HttpResponseContextImpl(
|
new Future<ResponseContext>.value(new HttpResponseContext(
|
||||||
response, app, correspondingRequest as HttpRequestContextImpl)
|
response, app, correspondingRequest as HttpRequestContext)
|
||||||
..serializer = (app.serializer ?? json.encode)
|
..serializer = (app.serializer ?? json.encode)
|
||||||
..encoders.addAll(app.encoders ?? {}));
|
..encoders.addAll(app.encoders ?? {}));
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ import 'package:http_parser/http_parser.dart';
|
||||||
import '../core/core.dart';
|
import '../core/core.dart';
|
||||||
|
|
||||||
/// An implementation of [RequestContext] that wraps a [HttpRequest].
|
/// An implementation of [RequestContext] that wraps a [HttpRequest].
|
||||||
class HttpRequestContextImpl extends RequestContext<HttpRequest> {
|
class HttpRequestContext extends RequestContext<HttpRequest> {
|
||||||
MediaType _contentType;
|
MediaType _contentType;
|
||||||
HttpRequest _io;
|
HttpRequest _io;
|
||||||
String _override, _path;
|
String _override, _path;
|
||||||
|
@ -75,9 +75,9 @@ class HttpRequestContextImpl extends RequestContext<HttpRequest> {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Magically transforms an [HttpRequest] into a [RequestContext].
|
/// Magically transforms an [HttpRequest] into a [RequestContext].
|
||||||
static Future<HttpRequestContextImpl> from(
|
static Future<HttpRequestContext> from(
|
||||||
HttpRequest request, Angel app, String path) {
|
HttpRequest request, Angel app, String path) {
|
||||||
HttpRequestContextImpl ctx = new HttpRequestContextImpl();
|
HttpRequestContext ctx = new HttpRequestContext();
|
||||||
|
|
||||||
String override = request.method;
|
String override = request.method;
|
||||||
|
|
||||||
|
|
|
@ -4,16 +4,16 @@ import 'dart:io';
|
||||||
import '../core/core.dart';
|
import '../core/core.dart';
|
||||||
import 'http_request_context.dart';
|
import 'http_request_context.dart';
|
||||||
|
|
||||||
class HttpResponseContextImpl extends ResponseContext<HttpResponse> {
|
class HttpResponseContext extends ResponseContext<HttpResponse> {
|
||||||
/// The underlying [HttpResponse] under this instance.
|
/// The underlying [HttpResponse] under this instance.
|
||||||
@override
|
@override
|
||||||
final HttpResponse rawResponse;
|
final HttpResponse rawResponse;
|
||||||
Angel app;
|
Angel app;
|
||||||
|
|
||||||
final HttpRequestContextImpl _correspondingRequest;
|
final HttpRequestContext _correspondingRequest;
|
||||||
bool _isClosed = false, _useStream = false;
|
bool _isClosed = false, _useStream = false;
|
||||||
|
|
||||||
HttpResponseContextImpl(this.rawResponse, this.app, [this._correspondingRequest]);
|
HttpResponseContext(this.rawResponse, this.app, [this._correspondingRequest]);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
RequestContext get correspondingRequest {
|
RequestContext get correspondingRequest {
|
||||||
|
|
Loading…
Reference in a new issue