Remove deprecated CollectionSink and Stream.pipeInto.

pkg/http/lib/src/multipart_request.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.
 
 library multipart_request;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:math';
 import 'dart:uri';
@@ skipping 25 matching lines @@
 class MultipartRequest extends BaseRequest {
   /// The total length of the multipart boundaries used when building the
   /// request body. According to http://tools.ietf.org/html/rfc1341.html, this
   /// can't be longer than 70.
   static final int _BOUNDARY_LENGTH = 70;
 
   static final Random _random = new Random();
 
   /// The total length of the request body, in bytes. This is calculated from
   /// [fields] and [files] and cannot be set manually.
   int get contentLength {

[Lasse Reichstein Nielsen, 2013/04/11 09:29:13]

Could you move these gettes below the constructor?

[Anders Johnsen, 2013/04/11 09:31:26]

Done.

[Anders Johnsen, 2013/04/11 09:31:26]

Done.

     var length = 0;
 
     fields.forEach((name, value) {
       length += "--".length + _BOUNDARY_LENGTH + "\r\n".length +
           _headerForField(name, value).length +
           encodeUtf8(value).length + "\r\n".length;
     });
 
-    for (var file in _files.collection) {
+    for (var file in _files) {
       length += "--".length + _BOUNDARY_LENGTH + "\r\n".length +
           _headerForFile(file).length +
           file.length + "\r\n".length;
     }
 
     return length + "--".length + _BOUNDARY_LENGTH + "--\r\n".length;
   }
 
   set contentLength(int value) {
     throw new UnsupportedError("Cannot set the contentLength property of "
         "multipart requests.");
   }
 
   /// The form fields to send for this request.
   final Map<String, String> fields;
 
   /// The sink for files to upload for this request.
   ///
   /// This doesn't need to be closed. When the request is sent, whichever files
   /// are written to this sink at that point will be used.
-  CollectionSink<MultipartFile> get files => _files;
+  List<MultipartFile> get files => _files;
 
-  /// The private version of [files], typed so that the underlying collection is
-  /// accessible.
-  final CollectionSink<MultipartFile> _files;
+  /// The private version of [files].
+  final List<MultipartFile> _files;
 
   /// Creates a new [MultipartRequest].
   MultipartRequest(String method, Uri url)
     : super(method, url),
       fields = {},
-      _files = new CollectionSink<MultipartFile>(<MultipartFile>[]);
+      _files = <MultipartFile>[];
 
   /// Freezes all mutable fields and returns a single-subscription [ByteStream]
   /// that will emit the request body.
   ByteStream finalize() {
     // TODO(nweiz): freeze fields and files
     var boundary = _boundaryString(_BOUNDARY_LENGTH);
     headers['content-type'] = 'multipart/form-data; boundary="$boundary"';
     headers['content-transfer-encoding'] = 'binary';
     super.finalize();
 
     var controller = new StreamController<List<int>>();
 
     void writeAscii(String string) {
       assert(isPlainAscii(string));
       controller.add(string.codeUnits);
     }
 
     writeUtf8(String string) => controller.add(encodeUtf8(string));
     writeLine() => controller.add([13, 10]); // \r\n
 
     fields.forEach((name, value) {
       writeAscii('--$boundary\r\n');
       writeAscii(_headerForField(name, value));
       writeUtf8(value);
       writeLine();
     });
 
-    Future.forEach(_files.collection, (file) {
+    Future.forEach(_files, (file) {
       writeAscii('--$boundary\r\n');
       writeAscii(_headerForFile(file));
       return writeStreamToSink(file.finalize(), controller)
         .then((_) => writeLine());
     }).then((_) {
       // TODO(nweiz): pass any errors propagated through this future on to
       // the stream. See issue 3657.
       writeAscii('--$boundary--\r\n');
       controller.close();
     });
@@ skipping 41 matching lines @@
   String _boundaryString(int length) {
     var prefix = "dart-http-boundary-";
     var list = new List<int>(length - prefix.length);
     for (var i = 0; i < list.length; i++) {
       list[i] = _BOUNDARY_CHARACTERS[
           _random.nextInt(_BOUNDARY_CHARACTERS.length)];
     }
     return "$prefix${new String.fromCharCodes(list)}";
   }
 }