Update deprecated references.
Change-Id: I99b827502fef1c4dc2d8ccdece74df59765dcb54
Reviewed-on: https://dart-review.googlesource.com/61300
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Devon Carew <devoncarew@google.com>
diff --git a/pkg/analysis_server/lib/src/server/http_server.dart b/pkg/analysis_server/lib/src/server/http_server.dart
index 6acfe4e..c5cff7d 100644
--- a/pkg/analysis_server/lib/src/server/http_server.dart
+++ b/pkg/analysis_server/lib/src/server/http_server.dart
@@ -29,8 +29,8 @@
@override
void handleGetRequest(HttpRequest request) {
HttpResponse response = request.response;
- response.statusCode = HttpStatus.NOT_FOUND;
- response.headers.contentType = ContentType.TEXT;
+ response.statusCode = HttpStatus.notFound;
+ response.headers.contentType = ContentType.text;
response.write(message);
response.close();
}
@@ -146,7 +146,7 @@
httpServer.listen((HttpRequest request) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
- List<String> updateValues = request.headers[HttpHeaders.UPGRADE];
+ List<String> updateValues = request.headers[HttpHeaders.upgradeHeader];
if (request.method == 'GET') {
await _handleGetRequest(request);
} else if (updateValues != null &&
@@ -154,8 +154,8 @@
// We no longer support serving analysis server communications over
// WebSocket connections.
HttpResponse response = request.response;
- response.statusCode = HttpStatus.NOT_FOUND;
- response.headers.contentType = ContentType.TEXT;
+ response.statusCode = HttpStatus.notFound;
+ response.headers.contentType = ContentType.text;
response.write(
'WebSocket connections not supported (${request.uri.path}).');
response.close();
@@ -171,8 +171,8 @@
*/
void _returnUnknownRequest(HttpRequest request) {
HttpResponse response = request.response;
- response.statusCode = HttpStatus.NOT_FOUND;
- response.headers.contentType = ContentType.TEXT;
+ response.statusCode = HttpStatus.notFound;
+ response.headers.contentType = ContentType.text;
response.write('Not found');
response.close();
}
diff --git a/pkg/analysis_server/lib/src/status/pages.dart b/pkg/analysis_server/lib/src/status/pages.dart
index d13e0de..f9c7e06 100644
--- a/pkg/analysis_server/lib/src/status/pages.dart
+++ b/pkg/analysis_server/lib/src/status/pages.dart
@@ -156,22 +156,22 @@
for (Page page in pages) {
if (page.path == path) {
HttpResponse response = request.response;
- response.headers.contentType = ContentType.HTML;
+ response.headers.contentType = ContentType.html;
response.write(await page.generate(request.uri.queryParameters));
response.close();
return;
}
}
- await respond(request, createUnknownPage(path), HttpStatus.NOT_FOUND);
+ await respond(request, createUnknownPage(path), HttpStatus.notFound);
} catch (e, st) {
try {
await respond(request, createExceptionPage('$e', st),
- HttpStatus.INTERNAL_SERVER_ERROR);
+ HttpStatus.internalServerError);
} catch (e, st) {
HttpResponse response = request.response;
- response.statusCode = HttpStatus.INTERNAL_SERVER_ERROR;
- response.headers.contentType = ContentType.TEXT;
+ response.statusCode = HttpStatus.internalServerError;
+ response.headers.contentType = ContentType.text;
response.write('$e\n\n$st');
response.close();
}
@@ -179,19 +179,19 @@
}
Future<Null> respond(HttpRequest request, Page page,
- [int code = HttpStatus.OK]) async {
+ [int code = HttpStatus.ok]) async {
// TODO(brianwilkerson) Determine whether this await is necessary.
await null;
HttpResponse response = request.response;
response.statusCode = code;
- response.headers.contentType = ContentType.HTML;
+ response.headers.contentType = ContentType.html;
response.write(await page.generate(request.uri.queryParameters));
response.close();
}
void respondRedirect(HttpRequest request, String pathFragment) {
HttpResponse response = request.response;
- response.statusCode = HttpStatus.MOVED_TEMPORARILY;
+ response.statusCode = HttpStatus.movedTemporarily;
response.redirect(request.uri.resolve(pathFragment));
}
}
diff --git a/pkg/analysis_server/tool/instrumentation/server.dart b/pkg/analysis_server/tool/instrumentation/server.dart
index 64f77bb..558cac1 100644
--- a/pkg/analysis_server/tool/instrumentation/server.dart
+++ b/pkg/analysis_server/tool/instrumentation/server.dart
@@ -102,7 +102,9 @@
*/
void serveHttp(int port) {
_server = HttpServer.bind(InternetAddress.loopbackIPv4, port);
- _server.then(_handleServer).catchError((_) {/* Ignore errors. */});
+ _server.then(_handleServer).catchError((_) {
+ /* Ignore errors. */
+ });
}
/**
@@ -127,7 +129,7 @@
return;
} catch (exception, stackTrace) {
HttpResponse response = request.response;
- response.statusCode = HttpStatus.OK;
+ response.statusCode = HttpStatus.ok;
response.headers.contentType = _htmlContent;
StringBuffer buffer = new StringBuffer();
buffer.write('<p><b>Exception while composing page:</b></p>');
@@ -141,7 +143,7 @@
}
HttpResponse response = request.response;
- response.statusCode = HttpStatus.OK;
+ response.statusCode = HttpStatus.ok;
response.headers.contentType = _htmlContent;
response.write(buffer.toString());
response.close();
@@ -176,11 +178,11 @@
*/
void _returnUnknownRequest(HttpRequest request) {
HttpResponse response = request.response;
- response.statusCode = HttpStatus.NOT_FOUND;
+ response.statusCode = HttpStatus.notFound;
response.headers.contentType =
new ContentType("text", "html", charset: "utf-8");
- response.write(
- '<html><head></head><body><h3>Page not found: "${request.uri.path}".</h3></body></html>');
+ response.write('<html><head></head><body><h3>Page not found: "${request.uri
+ .path}".</h3></body></html>');
response.close();
}
