Upgrade http Package to v1.1.0

example/client/bin/client.dart

@@ -38,15 +38,19 @@ void main(List<String> arguments) async {
     final ctx =
         withHttpRequestHeaders(Context(), {'Auth-Token': 'SuperSecretAPIKey'});
 
+    final z = Size()..inches = 4;
+    z.inches = 1;
+
     final hat =
-        await client.makeHat(ctx, Size(inches: Random().nextInt(4) + 6));
+        await client.makeHat(ctx, Size()..inches = Random().nextInt(4) + 6);
     print("Hat made: ${hat.inches}in ${hat.color} ${hat.name}");
 
-    final suit = await client.makeSuit(ctx, SuitSizeReq(size: SuitSize.LG));
+    final suit = await client.makeSuit(ctx, SuitSizeReq()..size = SuitSize.LG);
     print("Suit made: ${suit.size} ${suit.color}");
 
     // This will create an error to test the error handler
-    await client.makeHat(ctx, Size(inches: 0));
+    print("\nExpecting error:");
+    await client.makeHat(ctx, Size()..inches = 0);
   } on TwirpError catch (e) {
     final method =
         e.getContext.value(ContextKeys.methodName) ?? 'unknown method';

example/client/lib/protos/haberdasher.pb.dart

@@ -1,9 +1,13 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: haberdasher.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 import 'dart:async' as $async;
 import 'dart:core' as $core;
@@ -13,39 +17,22 @@ import 'package:protobuf/protobuf.dart' as $pb;
 import 'suit.pb.dart' as $0;
 
 class Size extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'Size',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'protos'),
-      createEmptyInstance: create)
-    ..a<$core.int>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'inches',
-        $pb.PbFieldType.O3)
-    ..hasRequiredFields = false;
-
+  factory Size() => create();
   Size._() : super();
-  factory Size({
-    $core.int? inches,
-  }) {
-    final _result = create();
-    if (inches != null) {
-      _result.inches = inches;
-    }
-    return _result;
-  }
   factory Size.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory Size.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Size',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protos'),
+      createEmptyInstance: create)
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'inches', $pb.PbFieldType.O3)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -54,9 +41,10 @@ class Size extends $pb.GeneratedMessage {
       'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
       'Will be removed in next major version')
   Size copyWith(void Function(Size) updates) =>
-      super.copyWith((message) => updates(message as Size))
-          as Size; // ignore: deprecated_member_use
+      super.copyWith((message) => updates(message as Size)) as Size;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static Size create() => Size._();
   Size createEmptyInstance() => create();
@@ -80,57 +68,24 @@ class Size extends $pb.GeneratedMessage {
 }
 
 class Hat extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'Hat',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'protos'),
-      createEmptyInstance: create)
-    ..a<$core.int>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'inches',
-        $pb.PbFieldType.O3)
-    ..aOS(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'color')
-    ..aOS(
-        3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'name')
-    ..hasRequiredFields = false;
-
+  factory Hat() => create();
   Hat._() : super();
-  factory Hat({
-    $core.int? inches,
-    $core.String? color,
-    $core.String? name,
-  }) {
-    final _result = create();
-    if (inches != null) {
-      _result.inches = inches;
-    }
-    if (color != null) {
-      _result.color = color;
-    }
-    if (name != null) {
-      _result.name = name;
-    }
-    return _result;
-  }
   factory Hat.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory Hat.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Hat',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'protos'),
+      createEmptyInstance: create)
+    ..a<$core.int>(1, _omitFieldNames ? '' : 'inches', $pb.PbFieldType.O3)
+    ..aOS(2, _omitFieldNames ? '' : 'color')
+    ..aOS(3, _omitFieldNames ? '' : 'name')
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -139,9 +94,10 @@ class Hat extends $pb.GeneratedMessage {
       'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
       'Will be removed in next major version')
   Hat copyWith(void Function(Hat) updates) =>
-      super.copyWith((message) => updates(message as Hat))
-          as Hat; // ignore: deprecated_member_use
+      super.copyWith((message) => updates(message as Hat)) as Hat;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static Hat create() => Hat._();
   Hat createEmptyInstance() => create();
@@ -192,16 +148,14 @@ class HaberdasherApi {
   $pb.RpcClient _client;
   HaberdasherApi(this._client);
 
-  $async.Future<Hat> makeHat($pb.ClientContext? ctx, Size request) {
-    var emptyResponse = Hat();
-    return _client.invoke<Hat>(
-        ctx, 'Haberdasher', 'MakeHat', request, emptyResponse);
-  }
-
+  $async.Future<Hat> makeHat($pb.ClientContext? ctx, Size request) =>
+      _client.invoke<Hat>(ctx, 'Haberdasher', 'MakeHat', request, Hat());
   $async.Future<$0.Suit> makeSuit(
-      $pb.ClientContext? ctx, $0.SuitSizeReq request) {
-    var emptyResponse = $0.Suit();
-    return _client.invoke<$0.Suit>(
-        ctx, 'Haberdasher', 'MakeSuit', request, emptyResponse);
-  }
+          $pb.ClientContext? ctx, $0.SuitSizeReq request) =>
+      _client.invoke<$0.Suit>(
+          ctx, 'Haberdasher', 'MakeSuit', request, $0.Suit());
 }
+
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');

example/client/lib/protos/haberdasher.pbenum.dart

@@ -1,6 +1,10 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: haberdasher.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import

example/client/lib/protos/haberdasher.pbjson.dart

@@ -1,51 +1,58 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: haberdasher.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
 
-import 'dart:core' as $core;
+// ignore_for_file: annotate_overrides, camel_case_types
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
 import 'dart:convert' as $convert;
+import 'dart:core' as $core;
 import 'dart:typed_data' as $typed_data;
+
 import 'suit.pbjson.dart' as $0;
 
 @$core.Deprecated('Use sizeDescriptor instead')
-const Size$json = const {
+const Size$json = {
   '1': 'Size',
-  '2': const [
-    const {'1': 'inches', '3': 1, '4': 1, '5': 5, '10': 'inches'},
+  '2': [
+    {'1': 'inches', '3': 1, '4': 1, '5': 5, '10': 'inches'},
   ],
 };
 
 /// Descriptor for `Size`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List sizeDescriptor =
     $convert.base64Decode('CgRTaXplEhYKBmluY2hlcxgBIAEoBVIGaW5jaGVz');
+
 @$core.Deprecated('Use hatDescriptor instead')
-const Hat$json = const {
+const Hat$json = {
   '1': 'Hat',
-  '2': const [
-    const {'1': 'inches', '3': 1, '4': 1, '5': 5, '10': 'inches'},
-    const {'1': 'color', '3': 2, '4': 1, '5': 9, '10': 'color'},
-    const {'1': 'name', '3': 3, '4': 1, '5': 9, '10': 'name'},
+  '2': [
+    {'1': 'inches', '3': 1, '4': 1, '5': 5, '10': 'inches'},
+    {'1': 'color', '3': 2, '4': 1, '5': 9, '10': 'color'},
+    {'1': 'name', '3': 3, '4': 1, '5': 9, '10': 'name'},
   ],
 };
 
 /// Descriptor for `Hat`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List hatDescriptor = $convert.base64Decode(
-    'CgNIYXQSFgoGaW5jaGVzGAEgASgFUgZpbmNoZXMSFAoFY29sb3IYAiABKAlSBWNvbG9yEhIKBG5hbWUYAyABKAlSBG5hbWU=');
-const $core.Map<$core.String, $core.dynamic> HaberdasherServiceBase$json =
-    const {
+    'CgNIYXQSFgoGaW5jaGVzGAEgASgFUgZpbmNoZXMSFAoFY29sb3IYAiABKAlSBWNvbG9yEhIKBG'
+    '5hbWUYAyABKAlSBG5hbWU=');
+
+const $core.Map<$core.String, $core.dynamic> HaberdasherServiceBase$json = {
   '1': 'Haberdasher',
-  '2': const [
-    const {'1': 'MakeHat', '2': '.protos.Size', '3': '.protos.Hat'},
-    const {'1': 'MakeSuit', '2': '.protos.SuitSizeReq', '3': '.protos.Suit'},
+  '2': [
+    {'1': 'MakeHat', '2': '.protos.Size', '3': '.protos.Hat'},
+    {'1': 'MakeSuit', '2': '.protos.SuitSizeReq', '3': '.protos.Suit'},
   ],
 };
 
 @$core.Deprecated('Use haberdasherServiceDescriptor instead')
 const $core.Map<$core.String, $core.Map<$core.String, $core.dynamic>>
-    HaberdasherServiceBase$messageJson = const {
+    HaberdasherServiceBase$messageJson = {
   '.protos.Size': Size$json,
   '.protos.Hat': Hat$json,
   '.protos.SuitSizeReq': $0.SuitSizeReq$json,
@@ -54,4 +61,5 @@ const $core.Map<$core.String, $core.Map<$core.String, $core.dynamic>>
 
 /// Descriptor for `Haberdasher`. Decode as a `google.protobuf.ServiceDescriptorProto`.
 final $typed_data.Uint8List haberdasherServiceDescriptor = $convert.base64Decode(
-    'CgtIYWJlcmRhc2hlchIkCgdNYWtlSGF0EgwucHJvdG9zLlNpemUaCy5wcm90b3MuSGF0Ei0KCE1ha2VTdWl0EhMucHJvdG9zLlN1aXRTaXplUmVxGgwucHJvdG9zLlN1aXQ=');
+    'CgtIYWJlcmRhc2hlchIkCgdNYWtlSGF0EgwucHJvdG9zLlNpemUaCy5wcm90b3MuSGF0Ei0KCE'
+    '1ha2VTdWl0EhMucHJvdG9zLlN1aXRTaXplUmVxGgwucHJvdG9zLlN1aXQ=');

example/client/lib/protos/haberdasher.pbserver.dart

@@ -1,18 +1,23 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: haberdasher.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 import 'dart:async' as $async;
+import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'dart:core' as $core;
 import 'haberdasher.pb.dart' as $1;
-import 'suit.pb.dart' as $0;
 import 'haberdasher.pbjson.dart';
+import 'suit.pb.dart' as $0;
 
 export 'haberdasher.pb.dart';
 
@@ -21,26 +26,26 @@ abstract class HaberdasherServiceBase extends $pb.GeneratedService {
   $async.Future<$0.Suit> makeSuit(
       $pb.ServerContext ctx, $0.SuitSizeReq request);
 
-  $pb.GeneratedMessage createRequest($core.String method) {
-    switch (method) {
+  $pb.GeneratedMessage createRequest($core.String methodName) {
+    switch (methodName) {
       case 'MakeHat':
         return $1.Size();
       case 'MakeSuit':
         return $0.SuitSizeReq();
       default:
-        throw $core.ArgumentError('Unknown method: $method');
+        throw $core.ArgumentError('Unknown method: $methodName');
     }
   }
 
   $async.Future<$pb.GeneratedMessage> handleCall($pb.ServerContext ctx,
-      $core.String method, $pb.GeneratedMessage request) {
-    switch (method) {
+      $core.String methodName, $pb.GeneratedMessage request) {
+    switch (methodName) {
       case 'MakeHat':
         return this.makeHat(ctx, request as $1.Size);
       case 'MakeSuit':
         return this.makeSuit(ctx, request as $0.SuitSizeReq);
       default:
-        throw $core.ArgumentError('Unknown method: $method');
+        throw $core.ArgumentError('Unknown method: $methodName');
     }
   }