[nnbd] Fix remaining NNBD errors in dart:_http and dart:io.

HeaderValue parameters must have non-null values per the specification.

Bug: #40040
Change-Id: I39f8c894015197c014057888026e4ad474aa5dc8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/134722
Reviewed-by: Lasse R.H. Nielsen <[email protected]>
Commit-Queue: Jonas Termansen <[email protected]>

Author: sortie

sdk_nnbd/lib/_http/http_headers.dart

@@ -624,12 +624,12 @@ class _HttpHeaders implements HttpHeaders {
 
 class _HeaderValue implements HeaderValue {
   String _value;
-  Map<String, String?>? _parameters;
-  Map<String, String?>? _unmodifiableParameters;
+  Map<String, String>? _parameters;
+  Map<String, String>? _unmodifiableParameters;
 
-  _HeaderValue([this._value = "", Map<String, String?>? parameters]) {
+  _HeaderValue([this._value = "", Map<String, String>? parameters]) {
     if (parameters != null) {
-      _parameters = new HashMap<String, String?>.from(parameters);
+      _parameters = new HashMap<String, String>.from(parameters);
     }
   }
 
@@ -645,19 +645,23 @@ class _HeaderValue implements HeaderValue {
 
   String get value => _value;
 
-  Map<String, String?> _ensureParameters() =>
-      _parameters ??= HashMap<String, String?>();
+  Map<String, String> _ensureParameters() =>
+      _parameters ??= HashMap<String, String>();
 
-  Map<String, String?> get parameters =>
+  Map<String, String> get parameters =>
       _unmodifiableParameters ??= UnmodifiableMapView(_ensureParameters());
 
   String toString() {
     StringBuffer sb = new StringBuffer();
     sb.write(_value);
     var parameters = this._parameters;
     if (parameters != null && parameters.length > 0) {
-      parameters.forEach((String name, String? value) {
-        sb..write("; ")..write(name)..write("=")..write(value ?? "");
+      parameters.forEach((String name, String value) {
+        sb
+          ..write("; ")
+          ..write(name)
+          ..write("=")
+          ..write(value == "" ? '""' : value);
       });
     }
     return sb.toString();
@@ -717,7 +721,7 @@ class _HeaderValue implements HeaderValue {
         return s.substring(start, index).toLowerCase();
       }
 
-      String? parseParameterValue() {
+      String parseParameterValue() {
         if (!done() && s[index] == "\"") {
           // Parse quoted value.
           StringBuffer sb = new StringBuffer();
@@ -742,8 +746,7 @@ class _HeaderValue implements HeaderValue {
           return sb.toString();
         } else {
           // Parse non-quoted value.
-          var val = parseValue();
-          return val == "" ? null : val;
+          return parseValue();
         }
       }
 
@@ -753,17 +756,17 @@ class _HeaderValue implements HeaderValue {
         String name = parseParameterName();
         skipWS();
         if (done()) {
-          parameters[name] = null;
+          parameters[name] = "";
           return;
         }
         maybeExpect("=");
         skipWS();
         if (done()) {
-          parameters[name] = null;
+          parameters[name] = "";
           return;
         }
-        String? value = parseParameterValue();
-        if (name == 'charset' && this is _ContentType && value != null) {
+        String value = parseParameterValue();
+        if (name == 'charset' && this is _ContentType) {
           // Charset parameter of ContentTypes are always lower-case.
           value = value.toLowerCase();
         }
@@ -790,17 +793,17 @@ class _ContentType extends _HeaderValue implements ContentType {
   String _subType = "";
 
   _ContentType(String primaryType, String subType, String? charset,
-      Map<String, String?>? parameters)
+      Map<String, String>? parameters)
       : _primaryType = primaryType,
         _subType = subType,
         super("") {
     _value = "$_primaryType/$_subType";
     if (parameters != null) {
       var parameterMap = _ensureParameters();
-      parameters.forEach((String key, String? value) {
+      parameters.forEach((String key, String value) {
         String lowerCaseKey = key.toLowerCase();
         if (lowerCaseKey == "charset") {
-          value = value?.toLowerCase();
+          value = value.toLowerCase();
         }
         parameterMap[lowerCaseKey] = value;
       });

sdk_nnbd/lib/_http/http_impl.dart

@@ -1512,7 +1512,7 @@ class _HttpOutgoing implements StreamConsumer<List<int>> {
           _gzipAdd = socket.add;
           if (_gzipBufferLength > 0) {
             _gzipSink!.add(new Uint8List.view(_gzipBuffer!.buffer,
-                _gzipBuffer.offsetInBytes, _gzipBufferLength));
+                _gzipBuffer!.offsetInBytes, _gzipBufferLength));
           }
           _gzipBuffer = null;
           _gzipSink!.close();
@@ -1523,7 +1523,7 @@ class _HttpOutgoing implements StreamConsumer<List<int>> {
       // Add any remaining data in the buffer.
       if (_length > 0) {
         socket.add(new Uint8List.view(
-            _buffer!.buffer, _buffer.offsetInBytes, _length));
+            _buffer!.buffer, _buffer!.offsetInBytes, _length));
       }
       // Clear references, for better GC.
       _buffer = null;
@@ -1608,15 +1608,15 @@ class _HttpOutgoing implements StreamConsumer<List<int>> {
         // If _buffer is not null, we have not written the header yet. Write
         // it now.
         add(new Uint8List.view(
-            _buffer!.buffer, _buffer.offsetInBytes, _length));
+            _buffer!.buffer, _buffer!.offsetInBytes, _length));
         _buffer = null;
         _length = 0;
       }
       add(chunk);
       return;
     }
     if (chunk.length > _buffer!.length - _length) {
-      add(new Uint8List.view(_buffer!.buffer, _buffer.offsetInBytes, _length));
+      add(new Uint8List.view(_buffer!.buffer, _buffer!.offsetInBytes, _length));
       _buffer = new Uint8List(_OUTGOING_BUFFER_SIZE);
       _length = 0;
     }

sdk_nnbd/lib/_http/http_parser.dart

@@ -932,7 +932,7 @@ class _HttpParser extends Stream<_HttpIncoming> {
 
   void _releaseBuffer() {
     _buffer = null;
-    _index = null;
+    _index = -1;
   }
 
   static bool _isTokenChar(int byte) {
@@ -1075,7 +1075,7 @@ class _HttpParser extends Stream<_HttpIncoming> {
   void _reportBodyError(error, [stackTrace]) {
     _socketSubscription?.cancel();
     _state = _State.FAILURE;
-    _bodyController.addError(error, stackTrace);
+    _bodyController?.addError(error, stackTrace);
     // In case of drain(), error event will close the stream.
     _bodyController?.close();
   }

sdk_nnbd/lib/_http/websocket.dart

@@ -134,7 +134,7 @@ class CompressionOptions {
       HeaderValue? requested) {
     var info = new _CompressionMaxWindowBits("", 0);
 
-    String? part = requested?.parameters?.[_serverMaxWindowBits];
+    String? part = requested?.parameters[_serverMaxWindowBits];
     if (part != null) {
       if (part.length >= 2 && part.startsWith('0')) {
         throw new ArgumentError("Illegal 0 padding on value.");
@@ -479,7 +479,7 @@ abstract class WebSocket
   /**
    * Sets the user agent to use for WebSocket connections.
    */
-  static set userAgent(String userAgent) {
+  static set userAgent(String? userAgent) {
     _WebSocketImpl.userAgent = userAgent;
   }
 }

sdk_nnbd/lib/_http/websocket_impl.dart

@@ -602,7 +602,9 @@ class _WebSocketPerMessageDeflate {
     final result = new BytesBuilder();
     List<int> out;
 
-    while ((out = decoder.processed()) != null) {
+    while (true) {
+      final out = decoder.processed();
+      if (out == null) break;
       result.add(out);
     }
 
@@ -633,8 +635,9 @@ class _WebSocketPerMessageDeflate {
 
     encoder.process(buffer, 0, buffer.length);
 
-    List<int> out;
-    while ((out = encoder.processed()) != null) {
+    while (true) {
+      final out = encoder.processed();
+      if (out == null) break;
       result.addAll(out);
     }
 

sdk_nnbd/lib/_internal/vm/bin/process_patch.dart

@@ -571,11 +571,13 @@ Future<ProcessResult> _runNonInteractiveProcess(
     Future foldStream(Stream<List<int>> stream, Encoding? encoding) {
       if (encoding == null) {
         return stream
-            .fold(new BytesBuilder(), (builder, data) => builder..add(data))
+            .fold<BytesBuilder>(
+                new BytesBuilder(), (builder, data) => builder..add(data))
             .then((builder) => builder.takeBytes());
       } else {
-        return stream.transform(encoding.decoder).fold(new StringBuffer(),
-            (buf, data) {
+        return stream
+            .transform(encoding.decoder)
+            .fold<StringBuffer>(new StringBuffer(), (buf, data) {
           buf.write(data);
           return buf;
         }).then((sb) => sb.toString());

sdk_nnbd/lib/_internal/vm/bin/socket_patch.dart

@@ -1311,7 +1311,7 @@ class _RawServerSocket extends Stream<RawSocket> implements RawServerSocket {
         controller.add(_RawSocket(socket));
         if (controller.isPaused) return;
       }
-    }), error: zone.bindBinaryCallbackGuarded((e, st) {
+    }), error: zone.bindBinaryCallbackGuarded((Object e, StackTrace st) {
       controller.addError(e, st);
       controller.close();
     }), destroyed: () {
@@ -1425,7 +1425,7 @@ class _RawSocket extends Stream<RawSocketEvent> implements RawSocket {
           _controller.add(RawSocketEvent.closed);
           _controller.close();
         },
-        error: zone.bindBinaryCallbackGuarded((e, st) {
+        error: zone.bindBinaryCallbackGuarded((Object e, StackTrace st) {
           _controller.addError(e, st);
           _socket.close();
         }));
@@ -1978,7 +1978,7 @@ class _RawDatagramSocket extends Stream<RawSocketEvent>
           _controller.add(RawSocketEvent.closed);
           _controller.close();
         },
-        error: zone.bindBinaryCallbackGuarded((e, st) {
+        error: zone.bindBinaryCallbackGuarded((Object e, StackTrace st) {
           _controller.addError(e, st);
           _socket.close();
         }));