Code cleanup (mostly io lib and some http lib).

sdk/lib/io/http.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of dart.io;
 
 /**
  * HTTP status codes.
  */
 abstract class HttpStatus {
@@ skipping 65 matching lines @@
  * [InternetAddress] on port 80, and listening to requests.
  *
  *     HttpServer.bind(InternetAddress.ANY_IP_V6, 80).then((server) {
  *       server.listen((HttpRequest request) {
  *         // Handle requests.
  *       });
  *     });
  */
 abstract class HttpServer implements Stream<HttpRequest> {
   /**
+   * Set and get the default value of the `Server` header for all responses
+   * generated by this [HttpServer]. The default value is
+   * `Dart/<version> (dart:io)`.
+   *
+   * If the serverHeader is set to `null`, no default `Server` header will be
+   * added to each response.
+   */
+  String serverHeader;
+
+  /**
+   * Get or set the timeout used for idle keep-alive connections. If no further
+   * request is seen within [idleTimeout] after the previous request was
+   * completed, the connection is dropped.
+   *
+   * Default is 120 seconds.
+   *
+   * To disable, set [idleTimeout] to `null`.
+   */
+  Duration idleTimeout;
+
+  /**
    * Starts listening for HTTP requests on the specified [address] and
    * [port].
    *
    * The [address] can either be a [String] or an
    * [InternetAddress]. If [address] is a [String], [bind] will
    * perform a [InternetAddress.lookup] and use the first value in the
    * list. To listen on the loopback adapter, which will allow only
    * incoming connections from the local host, use the value
    * [InternetAddress.LOOPBACK_IP_V4] or
    * [InternetAddress.LOOPBACK_IP_V6]. To allow for incoming
@@ skipping 102 matching lines @@
    * Sets the timeout, in seconds, for sessions of this [HttpServer].
    * The default timeout is 20 minutes.
    */
   set sessionTimeout(int timeout);
 
   /**
    * Returns an [HttpConnectionsInfo] object summarizing the number of
    * current connections handled by the server.
    */
   HttpConnectionsInfo connectionsInfo();
-
-  /**
-   * Set and get the default value of the `Server` header for all responses
-   * generated by this [HttpServer]. The default value is
-   * `Dart/<version> (dart:io)`.
-   *
-   * If the serverHeader is set to `null`, no default `Server` header will be
-   * added to each response.
-   */
-  String serverHeader;
-
-  /**
-   * Get or set the timeout used for idle keep-alive connections. If no further
-   * request is seen within [idleTimeout] after the previous request was
-   * completed, the connection is droped.
-   *
-   * Default is 120 seconds.
-   *
-   * To disable, set [idleTimeout] to `null`.
-   */
-  Duration idleTimeout;
 }
 
 
 /**
  * Summary statistics about an [HttpServer]s current socket connections.
  */
 class HttpConnectionsInfo {
   /**
    * Total number of socket connections.
    */
@@ skipping 126 matching lines @@
                                         IF_RANGE,
                                         IF_UNMODIFIED_SINCE,
                                         MAX_FORWARDS,
                                         PROXY_AUTHORIZATION,
                                         RANGE,
                                         REFERER,
                                         TE,
                                         USER_AGENT];
 
   /**
+   * Gets and sets the date. The value of this property will
+   * reflect the 'date' header.
+   */
+  DateTime date;
+
+  /**
+   * Gets and sets the expiry date. The value of this property will
+   * reflect the 'expires' header.
+   */
+  DateTime expires;
+
+  /**
+   * Gets and sets the "if-modified-since" date. The value of this property will
+   * reflect the "if-modified-since" header.
+   */
+  DateTime ifModifiedSince;
+
+  /**
+   * Gets and sets the host part of the 'host' header for the
+   * connection.
+   */
+  String host;
+
+  /**
+   * Gets and sets the port part of the 'host' header for the
+   * connection.
+   */
+  int port;
+
+  /**
+   * Gets and sets the content type. Note that the content type in the
+   * header will only be updated if this field is set
+   * directly. Mutating the returned current value will have no
+   * effect.
+   */
+  ContentType contentType;
+
+  /**
+   * Gets and sets the content length header value.
+   */
+  int contentLength;
+
+  /**
+   * Gets and sets the persistent connection header value.
+   */
+  bool persistentConnection;
+
+  /**
+   * Gets and sets the chunked transfer encoding header value.
+   */
+  bool chunkedTransferEncoding;
+
+  /**
    * Returns the list of values for the header named [name]. If there
    * is no header with the provided name, [:null:] will be returned.
    */
   List<String> operator[](String name);
 
   /**
    * Convenience method for the value for a single valued header. If
    * there is no header with the provided name, [:null:] will be
    * returned. If the header has more than one value an exception is
    * thrown.
@@ skipping 39 matching lines @@
    */
   void forEach(void f(String name, List<String> values));
 
   /**
    * Disables folding for the header named [name] when sending the HTTP
    * header. By default, multiple header values are folded into a
    * single header line by separating the values with commas. The
    * 'set-cookie' header has folding disabled by default.
    */
   void noFolding(String name);
-
-  /**
-   * Gets and sets the date. The value of this property will
-   * reflect the 'date' header.
-   */
-  DateTime date;
-
-  /**
-   * Gets and sets the expiry date. The value of this property will
-   * reflect the 'expires' header.
-   */
-  DateTime expires;
-
-  /**
-   * Gets and sets the "if-modified-since" date. The value of this property will
-   * reflect the "if-modified-since" header.
-   */
-  DateTime ifModifiedSince;
-
-  /**
-   * Gets and sets the host part of the 'host' header for the
-   * connection.
-   */
-  String host;
-
-  /**
-   * Gets and sets the port part of the 'host' header for the
-   * connection.
-   */
-  int port;
-
-  /**
-   * Gets and sets the content type. Note that the content type in the
-   * header will only be updated if this field is set
-   * directly. Mutating the returned current value will have no
-   * effect.
-   */
-  ContentType contentType;
-
-  /**
-   * Gets and sets the content length header value.
-   */
-  int contentLength;
-
-  /**
-   * Gets and sets the persistent connection header value.
-   */
-  bool persistentConnection;
-
-  /**
-   * Gets and sets the chunked transfer encoding header value.
-   */
-  bool chunkedTransferEncoding;
 }
 
 
 /**
  * Representation of a header value in the form:
  *
  *   [:value; parameter1=value1; parameter2=value2:]
  *
  * [HeaderValue] can be used to conveniently build and parse header
  * values on this form.
@@ skipping 143 matching lines @@
 
 /**
  * Representation of a cookie. For cookies received by the server as
  * Cookie header values only [:name:] and [:value:] fields will be
  * set. When building a cookie for the 'set-cookie' header in the server
  * and when receiving cookies in the client as 'set-cookie' headers all
  * fields can be used.
  */
 abstract class Cookie {
   /**
-   * Creates a new cookie optionally setting the name and value.
-   */
-  factory Cookie([String name, String value]) => new _Cookie(name, value);
-
-  /**
-   * Creates a new cookie by parsing a header value from a 'set-cookie'
-   * header.
-   */
-  factory Cookie.fromSetCookieValue(String value) {
-    return new _Cookie.fromSetCookieValue(value);
-  }
-
-  /**
    * Gets and sets the name.
    */
   String name;
 
   /**
    * Gets and sets the value.
    */
   String value;
 
   /**
@@ skipping 21 matching lines @@
    * Gets and sets whether this cookie is secure.
    */
   bool secure;
 
   /**
    * Gets and sets whether this cookie is HTTP only.
    */
   bool httpOnly;
 
   /**
+   * Creates a new cookie optionally setting the name and value.
+   */
+  factory Cookie([String name, String value]) => new _Cookie(name, value);
+
+  /**
+   * Creates a new cookie by parsing a header value from a 'set-cookie'
+   * header.
+   */
+  factory Cookie.fromSetCookieValue(String value) {
+    return new _Cookie.fromSetCookieValue(value);
+  }
+
+  /**
    * Returns the formatted string representation of the cookie. The
    * string representation can be used for for setting the Cookie or
    * 'set-cookie' headers
    */
   String toString();
 }
 
 
 /**
  * A server-side object
@@ skipping 17 matching lines @@
  * In the following code, an HttpServer listens
  * for HTTP requests and, within the callback function,
  * uses the HttpRequest object's `method` property to dispatch requests.
  *
  *     final HOST = InternetAddress.LOOPBACK_IP_V4;
  *     final PORT = 4040;
  *
  *     HttpServer.bind(HOST, PORT).then((_server) {
  *       _server.listen((HttpRequest request) {
  *         switch (request.method) {
- *           case 'GET': 
+ *           case 'GET':
  *             handleGetRequest(request);
  *             break;
- *           case 'POST': 
+ *           case 'POST':
  *             ...
  *         }
  *       },
  *       onError: handleError);    // listen() failed.
  *     }).catchError(handleError);
- *   
+ *
  * Listen to the HttpRequest stream to handle the
  * data and be notified once the entire body is received.
  * An HttpRequest object contains an [HttpResponse] object,
  * to which the server can write its response.
  * For example, here's a skeletal callback function
  * that responds to a request:
  *
  *     void handleGetRequest(HttpRequest req) {
  *       HttpResponse res = req.response;
  *       var body = [];
@@ skipping 56 matching lines @@
    * The session for the given request (read-only).
    *
    * If the session is
    * being initialized by this call, [:isNew:] is true for the returned
    * session.
    * See [HttpServer.sessionTimeout] on how to change default timeout.
    */
   HttpSession get session;
 
   /**
-   * The HTTP protocol version used in the request, 
+   * The HTTP protocol version used in the request,
    * either "1.0" or "1.1" (read-only).
    */
   String get protocolVersion;
 
   /**
    * Information about the client connection (read-only).
    *
    * Returns [null] if the socket is not available.
    */
   HttpConnectionInfo get connectionInfo;
@@ skipping 485 matching lines @@
  *
  *     HttpClientRequest request = ...
  *     request.headers.add(HttpHeaders.CONTENT_TYPE, "text/plain");
  *     request.write(...);  // Strings written will be ISO-8859-1 encoded.
  *
  * If an unsupported encoding is used an exception will be thrown if
  * using one of the write methods taking a string.
  */
 abstract class HttpClientRequest implements IOSink {
   /**
+   * Gets and sets the requested persistent connection state.
+   * The default value is [:true:].
+   */
+  bool persistentConnection;
+
+  /**
+   * Set this property to [:true:] if this request should
+   * automatically follow redirects. The default is [:true:].
+   *
+   * Automatic redirect will only happen for "GET" and "HEAD" requests
+   * and only for the status codes [:HttpHeaders.MOVED_PERMANENTLY:]
+   * (301), [:HttpStatus.FOUND:] (302),
+   * [:HttpStatus.MOVED_TEMPORARILY:] (302, alias for
+   * [:HttpStatus.FOUND:]), [:HttpStatus.SEE_OTHER:] (303) and
+   * [:HttpStatus.TEMPORARY_REDIRECT:] (307). For
+   * [:HttpStatus.SEE_OTHER:] (303) autmatic redirect will also happen
+   * for "POST" requests with the method changed to "GET" when
+   * following the redirect.
+   *
+   * All headers added to the request will be added to the redirection
+   * request(s). However, any body send with the request will not be
+   * part of the redirection request(s).
+   */
+  bool followRedirects;
+
+  /**
+   * Set this property to the maximum number of redirects to follow
+   * when [followRedirects] is [:true:]. If this number is exceeded the
+   * [onError] callback will be called with a [RedirectException].
+   *
+   * The default value is 5.
+   */
+  int maxRedirects;
+
+  /**
    * The method of the request.
    */
   String get method;
 
   /**
    * The uri of the request.
    */
   Uri get uri;
 
   /**
    * Gets and sets the content length of the request. If the size of
    * the request is not known in advance set content length to -1,
    * which is also the default.
    */
   int contentLength;
 
   /**
    * Returns the request headers.
    */
   HttpHeaders get headers;
 
   /**
    * Cookies to present to the server (in the 'cookie' header).
    */
   List<Cookie> get cookies;
 
   /**
-   * Gets and sets the requested persistent connection state.
-   * The default value is [:true:].
-   */
-  bool persistentConnection;
-
-  /**
    * A [HttpClientResponse] future that will complete once the response is
    * available. If an error occurs before the response is available, this
    * future will complete with an error.
    */
   Future<HttpClientResponse> get done;
 
   /**
    * Close the request for input. Returns the value of [done].
    */
   Future<HttpClientResponse> close();
 
   /**
-   * Set this property to [:true:] if this request should
-   * automatically follow redirects. The default is [:true:].
-   *
-   * Automatic redirect will only happen for "GET" and "HEAD" requests
-   * and only for the status codes [:HttpHeaders.MOVED_PERMANENTLY:]
-   * (301), [:HttpStatus.FOUND:] (302),
-   * [:HttpStatus.MOVED_TEMPORARILY:] (302, alias for
-   * [:HttpStatus.FOUND:]), [:HttpStatus.SEE_OTHER:] (303) and
-   * [:HttpStatus.TEMPORARY_REDIRECT:] (307). For
-   * [:HttpStatus.SEE_OTHER:] (303) autmatic redirect will also happen
-   * for "POST" requests with the method changed to "GET" when
-   * following the redirect.
-   *
-   * All headers added to the request will be added to the redirection
-   * request(s). However, any body send with the request will not be
-   * part of the redirection request(s).
-   */
-  bool followRedirects;
-
-  /**
-   * Set this property to the maximum number of redirects to follow
-   * when [followRedirects] is [:true:]. If this number is exceeded the
-   * [onError] callback will be called with a [RedirectException].
-   *
-   * The default value is 5.
-   */
-  int maxRedirects;
-
-  /**
    * Get information about the client connection. Returns [null] if the socket
    * is not available.
    */
   HttpConnectionInfo get connectionInfo;
 }
 
 
 /**
  * HTTP response for a client connection. The [HttpClientResponse] is a
  * [Stream] of the body content of the response. Listen to the body to handle
@@ skipping 160 matching lines @@
 }
 
 
 class HttpException implements IOException {
   final String message;
   final Uri uri;
 
   const HttpException(String this.message, {Uri this.uri});
 
   String toString() {
-    var b = new StringBuffer();
-    b.write('HttpException: ');
-    b.write(message);
+    var b = new StringBuffer()
+        ..write('HttpException: ')
+        ..write(message);
     if (uri != null) {
       b.write(', uri = $uri');
     }
     return b.toString();
   }
 }
 
 
 class RedirectException implements HttpException {
   final String message;
   final List<RedirectInfo> redirects;
 
-  const RedirectException(String this.message,
-                          List<RedirectInfo> this.redirects);
+  const RedirectException(this.message, this.redirects);
 
   String toString() => "RedirectException: $message";
 
   Uri get uri => redirects.last.location;
 }