From 151fa904b4a43215662dea823553e946d3f5f348 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Tue, 5 Oct 2021 08:39:00 -0700 Subject: [PATCH 1/2] Remove unnecessary imports and superfluous type checks (#525) --- example/helloworld/bin/client.dart | 1 - example/helloworld/bin/server.dart | 1 - example/helloworld/bin/unix_client.dart | 3 +-- example/helloworld/bin/unix_server.dart | 3 +-- example/route_guide/lib/src/client.dart | 1 - example/route_guide/lib/src/server.dart | 1 - interop/lib/src/client.dart | 4 ++-- test/client_handles_bad_connections_test.dart | 3 ++- test/client_tests/client_interceptor_test.dart | 1 - test/client_tests/client_test.dart | 1 - test/client_tests/grpc_or_grpcweb_channel_grpc_test.dart | 2 -- 11 files changed, 6 insertions(+), 15 deletions(-) diff --git a/example/helloworld/bin/client.dart b/example/helloworld/bin/client.dart index 9c023a42..4d4635d9 100644 --- a/example/helloworld/bin/client.dart +++ b/example/helloworld/bin/client.dart @@ -15,7 +15,6 @@ /// Dart implementation of the gRPC helloworld.Greeter client. import 'package:grpc/grpc.dart'; -import 'package:helloworld/src/generated/helloworld.pb.dart'; import 'package:helloworld/src/generated/helloworld.pbgrpc.dart'; Future main(List args) async { diff --git a/example/helloworld/bin/server.dart b/example/helloworld/bin/server.dart index bc8afea0..90516677 100644 --- a/example/helloworld/bin/server.dart +++ b/example/helloworld/bin/server.dart @@ -15,7 +15,6 @@ /// Dart implementation of the gRPC helloworld.Greeter server. import 'package:grpc/grpc.dart'; -import 'package:helloworld/src/generated/helloworld.pb.dart'; import 'package:helloworld/src/generated/helloworld.pbgrpc.dart'; class GreeterService extends GreeterServiceBase { diff --git a/example/helloworld/bin/unix_client.dart b/example/helloworld/bin/unix_client.dart index 9d9ce546..5f30cc25 100644 --- a/example/helloworld/bin/unix_client.dart +++ b/example/helloworld/bin/unix_client.dart @@ -15,9 +15,8 @@ /// Dart implementation of the gRPC helloworld.Greeter client. import 'dart:io'; -import 'package:grpc/grpc.dart'; -import 'package:helloworld/src/generated/helloworld.pb.dart'; +import 'package:grpc/grpc.dart'; import 'package:helloworld/src/generated/helloworld.pbgrpc.dart'; Future main(List args) async { diff --git a/example/helloworld/bin/unix_server.dart b/example/helloworld/bin/unix_server.dart index d40d578f..0639d17d 100644 --- a/example/helloworld/bin/unix_server.dart +++ b/example/helloworld/bin/unix_server.dart @@ -15,9 +15,8 @@ /// Dart implementation of the gRPC helloworld.Greeter server. import 'dart:io'; -import 'package:grpc/grpc.dart'; -import 'package:helloworld/src/generated/helloworld.pb.dart'; +import 'package:grpc/grpc.dart'; import 'package:helloworld/src/generated/helloworld.pbgrpc.dart'; class GreeterService extends GreeterServiceBase { diff --git a/example/route_guide/lib/src/client.dart b/example/route_guide/lib/src/client.dart index f2ba669e..875247c0 100644 --- a/example/route_guide/lib/src/client.dart +++ b/example/route_guide/lib/src/client.dart @@ -18,7 +18,6 @@ import 'dart:math' show Random; import 'package:grpc/grpc.dart'; import 'common.dart'; -import 'generated/route_guide.pb.dart'; import 'generated/route_guide.pbgrpc.dart'; class Client { diff --git a/example/route_guide/lib/src/server.dart b/example/route_guide/lib/src/server.dart index 74782d50..8f02a790 100644 --- a/example/route_guide/lib/src/server.dart +++ b/example/route_guide/lib/src/server.dart @@ -18,7 +18,6 @@ import 'dart:math' show atan2, cos, max, min, pi, sin, sqrt; import 'package:grpc/grpc.dart' as grpc; import 'common.dart'; -import 'generated/route_guide.pb.dart'; import 'generated/route_guide.pbgrpc.dart'; class RouteGuideService extends RouteGuideServiceBase { diff --git a/interop/lib/src/client.dart b/interop/lib/src/client.dart index cb135690..8cead2f1 100644 --- a/interop/lib/src/client.dart +++ b/interop/lib/src/client.dart @@ -19,6 +19,7 @@ import 'dart:typed_data'; import 'package:collection/collection.dart'; import 'package:grpc/grpc.dart'; + import 'generated/empty.pb.dart'; import 'generated/messages.pb.dart'; import 'generated/test.pbgrpc.dart'; @@ -152,8 +153,7 @@ class Tester { /// * call was successful /// * response is non-null Future emptyUnary() async { - final response = await client.emptyCall(Empty()); - if (response is! Empty) throw 'Expected Empty response.'; + await client.emptyCall(Empty()); } /// This test verifies that gRPC requests marked as cacheable use GET verb diff --git a/test/client_handles_bad_connections_test.dart b/test/client_handles_bad_connections_test.dart index 7368aefd..7aa08213 100644 --- a/test/client_handles_bad_connections_test.dart +++ b/test/client_handles_bad_connections_test.dart @@ -1,12 +1,13 @@ @TestOn('vm') import 'dart:async'; + import 'package:grpc/grpc.dart' as grpc; -import 'package:grpc/service_api.dart'; import 'package:grpc/src/client/channel.dart'; import 'package:grpc/src/client/connection.dart'; import 'package:grpc/src/client/http2_connection.dart'; import 'package:http2/http2.dart'; import 'package:test/test.dart'; + import 'common.dart'; class TestClient extends grpc.Client { diff --git a/test/client_tests/client_interceptor_test.dart b/test/client_tests/client_interceptor_test.dart index 0fbaf591..b05a9a9b 100644 --- a/test/client_tests/client_interceptor_test.dart +++ b/test/client_tests/client_interceptor_test.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:grpc/grpc.dart'; -import 'package:grpc/src/client/interceptor.dart'; import 'package:http2/transport.dart'; import 'package:test/test.dart'; diff --git a/test/client_tests/client_test.dart b/test/client_tests/client_test.dart index 94bb0784..7a12991d 100644 --- a/test/client_tests/client_test.dart +++ b/test/client_tests/client_test.dart @@ -18,7 +18,6 @@ import 'dart:convert'; import 'dart:io' show HttpStatus; import 'package:grpc/grpc.dart'; -import 'package:grpc/src/client/call.dart'; import 'package:grpc/src/client/http2_connection.dart'; import 'package:grpc/src/generated/google/rpc/status.pb.dart'; import 'package:grpc/src/shared/status.dart'; diff --git a/test/client_tests/grpc_or_grpcweb_channel_grpc_test.dart b/test/client_tests/grpc_or_grpcweb_channel_grpc_test.dart index afa2698e..bffd8ba8 100644 --- a/test/client_tests/grpc_or_grpcweb_channel_grpc_test.dart +++ b/test/client_tests/grpc_or_grpcweb_channel_grpc_test.dart @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. @TestOn('!browser') - import 'package:grpc/grpc.dart'; import 'package:grpc/grpc_or_grpcweb.dart'; import 'package:test/test.dart'; @@ -28,7 +27,6 @@ void main() { port: port, transportSecure: false, ); - expect(channel is ClientChannel, isTrue); expect(channel.host, equals(host)); expect(channel.port, equals(port)); expect(channel.options.credentials.isSecure, isFalse); From 7e2c2665cfaa18e13979f60c2f2bd8f7d2daf7bc Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Tue, 4 Jan 2022 11:05:22 +1100 Subject: [PATCH 2/2] Migrate examples to Dart null safety (#536) --- example/googleapis/README.md | 4 +- .../src/generated/google/api/label.pb.dart | 14 +- .../generated/google/api/label.pbenum.dart | 4 +- .../generated/google/api/label.pbjson.dart | 14 +- .../generated/google/api/launch_stage.pb.dart | 2 +- .../google/api/launch_stage.pbenum.dart | 4 +- .../google/api/launch_stage.pbjson.dart | 13 +- .../google/api/monitored_resource.pb.dart | 41 ++--- .../google/api/monitored_resource.pbenum.dart | 2 +- .../google/api/monitored_resource.pbjson.dart | 25 ++- .../google/logging/type/http_request.pb.dart | 38 ++--- .../logging/type/http_request.pbenum.dart | 2 +- .../logging/type/http_request.pbjson.dart | 13 +- .../google/logging/type/log_severity.pb.dart | 2 +- .../logging/type/log_severity.pbenum.dart | 4 +- .../logging/type/log_severity.pbjson.dart | 13 +- .../google/logging/v2/log_entry.pb.dart | 68 ++++---- .../google/logging/v2/log_entry.pbenum.dart | 2 +- .../google/logging/v2/log_entry.pbjson.dart | 23 ++- .../google/logging/v2/logging.pb.dart | 148 +++++++++--------- .../google/logging/v2/logging.pbenum.dart | 4 +- .../google/logging/v2/logging.pbgrpc.dart | 18 +-- .../google/logging/v2/logging.pbjson.dart | 69 +++++++- .../src/generated/google/protobuf/any.pb.dart | 13 +- .../generated/google/protobuf/any.pbenum.dart | 2 +- .../generated/google/protobuf/any.pbjson.dart | 13 +- .../google/protobuf/duration.pb.dart | 12 +- .../google/protobuf/duration.pbenum.dart | 2 +- .../google/protobuf/duration.pbjson.dart | 13 +- .../generated/google/protobuf/empty.pb.dart | 9 +- .../google/protobuf/empty.pbenum.dart | 2 +- .../google/protobuf/empty.pbjson.dart | 13 +- .../generated/google/protobuf/struct.pb.dart | 40 ++--- .../google/protobuf/struct.pbenum.dart | 4 +- .../google/protobuf/struct.pbjson.dart | 26 ++- .../google/protobuf/timestamp.pb.dart | 12 +- .../google/protobuf/timestamp.pbenum.dart | 2 +- .../google/protobuf/timestamp.pbjson.dart | 13 +- .../src/generated/google/rpc/status.pb.dart | 15 +- .../generated/google/rpc/status.pbenum.dart | 2 +- .../generated/google/rpc/status.pbjson.dart | 13 +- example/googleapis/pubspec.yaml | 2 +- example/googleapis/tool/regenerate.sh | 2 +- example/grpc-web/README.md | 6 +- example/grpc-web/analysis_options.yaml | 5 + example/grpc-web/lib/app.dart | 2 +- .../grpc-web/lib/src/generated/echo.pb.dart | 40 ++--- .../lib/src/generated/echo.pbenum.dart | 2 +- .../lib/src/generated/echo.pbgrpc.dart | 10 +- .../lib/src/generated/echo.pbjson.dart | 27 +++- example/grpc-web/pubspec.yaml | 2 +- example/grpc-web/web/main.dart | 4 +- example/helloworld/analysis_options.yaml | 5 + .../lib/src/generated/helloworld.pb.dart | 18 +-- .../lib/src/generated/helloworld.pbenum.dart | 2 +- .../lib/src/generated/helloworld.pbgrpc.dart | 8 +- .../lib/src/generated/helloworld.pbjson.dart | 17 +- example/helloworld/pubspec.yaml | 2 +- example/metadata/README.md | 4 +- example/metadata/analysis_options.yaml | 5 + example/metadata/lib/src/client.dart | 4 +- .../lib/src/generated/metadata.pb.dart | 27 ++-- .../lib/src/generated/metadata.pbenum.dart | 6 + .../lib/src/generated/metadata.pbgrpc.dart | 12 +- .../lib/src/generated/metadata.pbjson.dart | 41 +++++ example/metadata/lib/src/server.dart | 8 +- example/metadata/pubspec.yaml | 2 +- example/route_guide/analysis_options.yaml | 5 + example/route_guide/lib/src/client.dart | 2 +- .../lib/src/generated/route_guide.pb.dart | 57 +++---- .../lib/src/generated/route_guide.pbenum.dart | 2 +- .../lib/src/generated/route_guide.pbgrpc.dart | 14 +- .../lib/src/generated/route_guide.pbjson.dart | 29 +++- example/route_guide/lib/src/server.dart | 7 +- example/route_guide/pubspec.yaml | 3 +- 75 files changed, 735 insertions(+), 380 deletions(-) create mode 100644 example/grpc-web/analysis_options.yaml create mode 100644 example/helloworld/analysis_options.yaml create mode 100644 example/metadata/analysis_options.yaml create mode 100644 example/metadata/lib/src/generated/metadata.pbenum.dart create mode 100644 example/metadata/lib/src/generated/metadata.pbjson.dart create mode 100644 example/route_guide/analysis_options.yaml diff --git a/example/googleapis/README.md b/example/googleapis/README.md index d78b5af6..b6a283a3 100644 --- a/example/googleapis/README.md +++ b/example/googleapis/README.md @@ -19,13 +19,13 @@ To run the example, assuming you are in the root of the googleapis folder, i.e., .../example/googleapis/, first get the dependencies by running: ```sh -$ pub get +$ dart pub get ``` Then, to run the logging client sample: ```sh -$ pub run googleapis:logging +$ dart run bin/logging.dart ``` # Regenerate the stubs diff --git a/example/googleapis/lib/src/generated/google/api/label.pb.dart b/example/googleapis/lib/src/generated/google/api/label.pb.dart index ef6a9fab..1d1ad20d 100644 --- a/example/googleapis/lib/src/generated/google/api/label.pb.dart +++ b/example/googleapis/lib/src/generated/google/api/label.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/api/label.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:core' as $core; @@ -46,9 +46,9 @@ class LabelDescriptor extends $pb.GeneratedMessage { LabelDescriptor._() : super(); factory LabelDescriptor({ - $core.String key, - LabelDescriptor_ValueType valueType, - $core.String description, + $core.String? key, + LabelDescriptor_ValueType? valueType, + $core.String? description, }) { final _result = create(); if (key != null) { @@ -76,8 +76,8 @@ class LabelDescriptor extends $pb.GeneratedMessage { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') LabelDescriptor copyWith(void Function(LabelDescriptor) updates) => - super.copyWith((message) => - updates(message as LabelDescriptor)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as LabelDescriptor)) + as LabelDescriptor; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static LabelDescriptor create() => LabelDescriptor._(); @@ -87,7 +87,7 @@ class LabelDescriptor extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static LabelDescriptor getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static LabelDescriptor _defaultInstance; + static LabelDescriptor? _defaultInstance; @$pb.TagNumber(1) $core.String get key => $_getSZ(0); diff --git a/example/googleapis/lib/src/generated/google/api/label.pbenum.dart b/example/googleapis/lib/src/generated/google/api/label.pbenum.dart index e4ee606f..df529508 100644 --- a/example/googleapis/lib/src/generated/google/api/label.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/api/label.pbenum.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/api/label.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields // ignore_for_file: UNDEFINED_SHOWN_NAME @@ -35,7 +35,7 @@ class LabelDescriptor_ValueType extends $pb.ProtobufEnum { static final $core.Map<$core.int, LabelDescriptor_ValueType> _byValue = $pb.ProtobufEnum.initByValue(values); - static LabelDescriptor_ValueType valueOf($core.int value) => _byValue[value]; + static LabelDescriptor_ValueType? valueOf($core.int value) => _byValue[value]; const LabelDescriptor_ValueType._($core.int v, $core.String n) : super(v, n); } diff --git a/example/googleapis/lib/src/generated/google/api/label.pbjson.dart b/example/googleapis/lib/src/generated/google/api/label.pbjson.dart index 65c2ce81..ce5bf69f 100644 --- a/example/googleapis/lib/src/generated/google/api/label.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/api/label.pbjson.dart @@ -2,9 +2,14 @@ // Generated code. Do not modify. // source: google/api/label.proto // -// @dart = 2.7 -// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package +import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; + +@$core.Deprecated('Use labelDescriptorDescriptor instead') const LabelDescriptor$json = const { '1': 'LabelDescriptor', '2': const [ @@ -22,6 +27,7 @@ const LabelDescriptor$json = const { '4': const [LabelDescriptor_ValueType$json], }; +@$core.Deprecated('Use labelDescriptorDescriptor instead') const LabelDescriptor_ValueType$json = const { '1': 'ValueType', '2': const [ @@ -30,3 +36,7 @@ const LabelDescriptor_ValueType$json = const { const {'1': 'INT64', '2': 2}, ], }; + +/// Descriptor for `LabelDescriptor`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List labelDescriptorDescriptor = $convert.base64Decode( + 'Cg9MYWJlbERlc2NyaXB0b3ISEAoDa2V5GAEgASgJUgNrZXkSRAoKdmFsdWVfdHlwZRgCIAEoDjIlLmdvb2dsZS5hcGkuTGFiZWxEZXNjcmlwdG9yLlZhbHVlVHlwZVIJdmFsdWVUeXBlEiAKC2Rlc2NyaXB0aW9uGAMgASgJUgtkZXNjcmlwdGlvbiIsCglWYWx1ZVR5cGUSCgoGU1RSSU5HEAASCAoEQk9PTBABEgkKBUlOVDY0EAI='); diff --git a/example/googleapis/lib/src/generated/google/api/launch_stage.pb.dart b/example/googleapis/lib/src/generated/google/api/launch_stage.pb.dart index 7d65cee2..9b8b442d 100644 --- a/example/googleapis/lib/src/generated/google/api/launch_stage.pb.dart +++ b/example/googleapis/lib/src/generated/google/api/launch_stage.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/api/launch_stage.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:core' as $core; diff --git a/example/googleapis/lib/src/generated/google/api/launch_stage.pbenum.dart b/example/googleapis/lib/src/generated/google/api/launch_stage.pbenum.dart index 3a8cc21d..9f1269f6 100644 --- a/example/googleapis/lib/src/generated/google/api/launch_stage.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/api/launch_stage.pbenum.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/api/launch_stage.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields // ignore_for_file: UNDEFINED_SHOWN_NAME @@ -61,7 +61,7 @@ class LaunchStage extends $pb.ProtobufEnum { static final $core.Map<$core.int, LaunchStage> _byValue = $pb.ProtobufEnum.initByValue(values); - static LaunchStage valueOf($core.int value) => _byValue[value]; + static LaunchStage? valueOf($core.int value) => _byValue[value]; const LaunchStage._($core.int v, $core.String n) : super(v, n); } diff --git a/example/googleapis/lib/src/generated/google/api/launch_stage.pbjson.dart b/example/googleapis/lib/src/generated/google/api/launch_stage.pbjson.dart index 0b3400e2..c2f60ce2 100644 --- a/example/googleapis/lib/src/generated/google/api/launch_stage.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/api/launch_stage.pbjson.dart @@ -2,9 +2,14 @@ // Generated code. Do not modify. // source: google/api/launch_stage.proto // -// @dart = 2.7 -// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package +import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; + +@$core.Deprecated('Use launchStageDescriptor instead') const LaunchStage$json = const { '1': 'LaunchStage', '2': const [ @@ -18,3 +23,7 @@ const LaunchStage$json = const { const {'1': 'DEPRECATED', '2': 5}, ], }; + +/// Descriptor for `LaunchStage`. Decode as a `google.protobuf.EnumDescriptorProto`. +final $typed_data.Uint8List launchStageDescriptor = $convert.base64Decode( + 'CgtMYXVuY2hTdGFnZRIcChhMQVVOQ0hfU1RBR0VfVU5TUEVDSUZJRUQQABIRCg1VTklNUExFTUVOVEVEEAYSDQoJUFJFTEFVTkNIEAcSEAoMRUFSTFlfQUNDRVNTEAESCQoFQUxQSEEQAhIICgRCRVRBEAMSBgoCR0EQBBIOCgpERVBSRUNBVEVEEAU='); diff --git a/example/googleapis/lib/src/generated/google/api/monitored_resource.pb.dart b/example/googleapis/lib/src/generated/google/api/monitored_resource.pb.dart index 1c90033d..fce05f47 100644 --- a/example/googleapis/lib/src/generated/google/api/monitored_resource.pb.dart +++ b/example/googleapis/lib/src/generated/google/api/monitored_resource.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/api/monitored_resource.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:core' as $core; @@ -64,12 +64,12 @@ class MonitoredResourceDescriptor extends $pb.GeneratedMessage { MonitoredResourceDescriptor._() : super(); factory MonitoredResourceDescriptor({ - $core.String type, - $core.String displayName, - $core.String description, - $core.Iterable<$0.LabelDescriptor> labels, - $core.String name, - $2.LaunchStage launchStage, + $core.String? type, + $core.String? displayName, + $core.String? description, + $core.Iterable<$0.LabelDescriptor>? labels, + $core.String? name, + $2.LaunchStage? launchStage, }) { final _result = create(); if (type != null) { @@ -108,8 +108,9 @@ class MonitoredResourceDescriptor extends $pb.GeneratedMessage { 'Will be removed in next major version') MonitoredResourceDescriptor copyWith( void Function(MonitoredResourceDescriptor) updates) => - super.copyWith((message) => updates(message - as MonitoredResourceDescriptor)); // ignore: deprecated_member_use + super.copyWith( + (message) => updates(message as MonitoredResourceDescriptor)) + as MonitoredResourceDescriptor; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MonitoredResourceDescriptor create() => @@ -120,7 +121,7 @@ class MonitoredResourceDescriptor extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static MonitoredResourceDescriptor getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static MonitoredResourceDescriptor _defaultInstance; + static MonitoredResourceDescriptor? _defaultInstance; @$pb.TagNumber(1) $core.String get type => $_getSZ(0); @@ -214,8 +215,8 @@ class MonitoredResource extends $pb.GeneratedMessage { MonitoredResource._() : super(); factory MonitoredResource({ - $core.String type, - $core.Map<$core.String, $core.String> labels, + $core.String? type, + $core.Map<$core.String, $core.String>? labels, }) { final _result = create(); if (type != null) { @@ -240,8 +241,8 @@ class MonitoredResource extends $pb.GeneratedMessage { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') MonitoredResource copyWith(void Function(MonitoredResource) updates) => - super.copyWith((message) => updates( - message as MonitoredResource)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as MonitoredResource)) + as MonitoredResource; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MonitoredResource create() => MonitoredResource._(); @@ -251,7 +252,7 @@ class MonitoredResource extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static MonitoredResource getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static MonitoredResource _defaultInstance; + static MonitoredResource? _defaultInstance; @$pb.TagNumber(1) $core.String get type => $_getSZ(0); @@ -298,8 +299,8 @@ class MonitoredResourceMetadata extends $pb.GeneratedMessage { MonitoredResourceMetadata._() : super(); factory MonitoredResourceMetadata({ - $1.Struct systemLabels, - $core.Map<$core.String, $core.String> userLabels, + $1.Struct? systemLabels, + $core.Map<$core.String, $core.String>? userLabels, }) { final _result = create(); if (systemLabels != null) { @@ -326,8 +327,8 @@ class MonitoredResourceMetadata extends $pb.GeneratedMessage { 'Will be removed in next major version') MonitoredResourceMetadata copyWith( void Function(MonitoredResourceMetadata) updates) => - super.copyWith((message) => updates(message - as MonitoredResourceMetadata)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as MonitoredResourceMetadata)) + as MonitoredResourceMetadata; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MonitoredResourceMetadata create() => MonitoredResourceMetadata._(); @@ -337,7 +338,7 @@ class MonitoredResourceMetadata extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static MonitoredResourceMetadata getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static MonitoredResourceMetadata _defaultInstance; + static MonitoredResourceMetadata? _defaultInstance; @$pb.TagNumber(1) $1.Struct get systemLabels => $_getN(0); diff --git a/example/googleapis/lib/src/generated/google/api/monitored_resource.pbenum.dart b/example/googleapis/lib/src/generated/google/api/monitored_resource.pbenum.dart index b0331cc4..d504b540 100644 --- a/example/googleapis/lib/src/generated/google/api/monitored_resource.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/api/monitored_resource.pbenum.dart @@ -2,5 +2,5 @@ // Generated code. Do not modify. // source: google/api/monitored_resource.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields diff --git a/example/googleapis/lib/src/generated/google/api/monitored_resource.pbjson.dart b/example/googleapis/lib/src/generated/google/api/monitored_resource.pbjson.dart index 9a24f952..ec99a234 100644 --- a/example/googleapis/lib/src/generated/google/api/monitored_resource.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/api/monitored_resource.pbjson.dart @@ -2,9 +2,14 @@ // Generated code. Do not modify. // source: google/api/monitored_resource.proto // -// @dart = 2.7 -// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package +import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; + +@$core.Deprecated('Use monitoredResourceDescriptorDescriptor instead') const MonitoredResourceDescriptor$json = const { '1': 'MonitoredResourceDescriptor', '2': const [ @@ -31,6 +36,11 @@ const MonitoredResourceDescriptor$json = const { ], }; +/// Descriptor for `MonitoredResourceDescriptor`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List monitoredResourceDescriptorDescriptor = + $convert.base64Decode( + 'ChtNb25pdG9yZWRSZXNvdXJjZURlc2NyaXB0b3ISEgoEbmFtZRgFIAEoCVIEbmFtZRISCgR0eXBlGAEgASgJUgR0eXBlEiEKDGRpc3BsYXlfbmFtZRgCIAEoCVILZGlzcGxheU5hbWUSIAoLZGVzY3JpcHRpb24YAyABKAlSC2Rlc2NyaXB0aW9uEjMKBmxhYmVscxgEIAMoCzIbLmdvb2dsZS5hcGkuTGFiZWxEZXNjcmlwdG9yUgZsYWJlbHMSOgoMbGF1bmNoX3N0YWdlGAcgASgOMhcuZ29vZ2xlLmFwaS5MYXVuY2hTdGFnZVILbGF1bmNoU3RhZ2U='); +@$core.Deprecated('Use monitoredResourceDescriptor instead') const MonitoredResource$json = const { '1': 'MonitoredResource', '2': const [ @@ -47,6 +57,7 @@ const MonitoredResource$json = const { '3': const [MonitoredResource_LabelsEntry$json], }; +@$core.Deprecated('Use monitoredResourceDescriptor instead') const MonitoredResource_LabelsEntry$json = const { '1': 'LabelsEntry', '2': const [ @@ -56,6 +67,10 @@ const MonitoredResource_LabelsEntry$json = const { '7': const {'7': true}, }; +/// Descriptor for `MonitoredResource`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List monitoredResourceDescriptor = $convert.base64Decode( + 'ChFNb25pdG9yZWRSZXNvdXJjZRISCgR0eXBlGAEgASgJUgR0eXBlEkEKBmxhYmVscxgCIAMoCzIpLmdvb2dsZS5hcGkuTW9uaXRvcmVkUmVzb3VyY2UuTGFiZWxzRW50cnlSBmxhYmVscxo5CgtMYWJlbHNFbnRyeRIQCgNrZXkYASABKAlSA2tleRIUCgV2YWx1ZRgCIAEoCVIFdmFsdWU6AjgB'); +@$core.Deprecated('Use monitoredResourceMetadataDescriptor instead') const MonitoredResourceMetadata$json = const { '1': 'MonitoredResourceMetadata', '2': const [ @@ -79,6 +94,7 @@ const MonitoredResourceMetadata$json = const { '3': const [MonitoredResourceMetadata_UserLabelsEntry$json], }; +@$core.Deprecated('Use monitoredResourceMetadataDescriptor instead') const MonitoredResourceMetadata_UserLabelsEntry$json = const { '1': 'UserLabelsEntry', '2': const [ @@ -87,3 +103,8 @@ const MonitoredResourceMetadata_UserLabelsEntry$json = const { ], '7': const {'7': true}, }; + +/// Descriptor for `MonitoredResourceMetadata`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List monitoredResourceMetadataDescriptor = + $convert.base64Decode( + 'ChlNb25pdG9yZWRSZXNvdXJjZU1ldGFkYXRhEjwKDXN5c3RlbV9sYWJlbHMYASABKAsyFy5nb29nbGUucHJvdG9idWYuU3RydWN0UgxzeXN0ZW1MYWJlbHMSVgoLdXNlcl9sYWJlbHMYAiADKAsyNS5nb29nbGUuYXBpLk1vbml0b3JlZFJlc291cmNlTWV0YWRhdGEuVXNlckxhYmVsc0VudHJ5Ugp1c2VyTGFiZWxzGj0KD1VzZXJMYWJlbHNFbnRyeRIQCgNrZXkYASABKAlSA2tleRIUCgV2YWx1ZRgCIAEoCVIFdmFsdWU6AjgB'); diff --git a/example/googleapis/lib/src/generated/google/logging/type/http_request.pb.dart b/example/googleapis/lib/src/generated/google/logging/type/http_request.pb.dart index bb1017cf..e73c6298 100644 --- a/example/googleapis/lib/src/generated/google/logging/type/http_request.pb.dart +++ b/example/googleapis/lib/src/generated/google/logging/type/http_request.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/logging/type/http_request.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:core' as $core; @@ -103,21 +103,21 @@ class HttpRequest extends $pb.GeneratedMessage { HttpRequest._() : super(); factory HttpRequest({ - $core.String requestMethod, - $core.String requestUrl, - $fixnum.Int64 requestSize, - $core.int status, - $fixnum.Int64 responseSize, - $core.String userAgent, - $core.String remoteIp, - $core.String referer, - $core.bool cacheHit, - $core.bool cacheValidatedWithOriginServer, - $core.bool cacheLookup, - $fixnum.Int64 cacheFillBytes, - $core.String serverIp, - $0.Duration latency, - $core.String protocol, + $core.String? requestMethod, + $core.String? requestUrl, + $fixnum.Int64? requestSize, + $core.int? status, + $fixnum.Int64? responseSize, + $core.String? userAgent, + $core.String? remoteIp, + $core.String? referer, + $core.bool? cacheHit, + $core.bool? cacheValidatedWithOriginServer, + $core.bool? cacheLookup, + $fixnum.Int64? cacheFillBytes, + $core.String? serverIp, + $0.Duration? latency, + $core.String? protocol, }) { final _result = create(); if (requestMethod != null) { @@ -181,8 +181,8 @@ class HttpRequest extends $pb.GeneratedMessage { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') HttpRequest copyWith(void Function(HttpRequest) updates) => - super.copyWith((message) => - updates(message as HttpRequest)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as HttpRequest)) + as HttpRequest; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static HttpRequest create() => HttpRequest._(); @@ -191,7 +191,7 @@ class HttpRequest extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static HttpRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static HttpRequest _defaultInstance; + static HttpRequest? _defaultInstance; @$pb.TagNumber(1) $core.String get requestMethod => $_getSZ(0); diff --git a/example/googleapis/lib/src/generated/google/logging/type/http_request.pbenum.dart b/example/googleapis/lib/src/generated/google/logging/type/http_request.pbenum.dart index fede761d..a77cd9e9 100644 --- a/example/googleapis/lib/src/generated/google/logging/type/http_request.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/logging/type/http_request.pbenum.dart @@ -2,5 +2,5 @@ // Generated code. Do not modify. // source: google/logging/type/http_request.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields diff --git a/example/googleapis/lib/src/generated/google/logging/type/http_request.pbjson.dart b/example/googleapis/lib/src/generated/google/logging/type/http_request.pbjson.dart index f625cb82..39988b43 100644 --- a/example/googleapis/lib/src/generated/google/logging/type/http_request.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/logging/type/http_request.pbjson.dart @@ -2,9 +2,14 @@ // Generated code. Do not modify. // source: google/logging/type/http_request.proto // -// @dart = 2.7 -// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package +import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; + +@$core.Deprecated('Use httpRequestDescriptor instead') const HttpRequest$json = const { '1': 'HttpRequest', '2': const [ @@ -50,3 +55,7 @@ const HttpRequest$json = const { const {'1': 'protocol', '3': 15, '4': 1, '5': 9, '10': 'protocol'}, ], }; + +/// Descriptor for `HttpRequest`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List httpRequestDescriptor = $convert.base64Decode( + 'CgtIdHRwUmVxdWVzdBIlCg5yZXF1ZXN0X21ldGhvZBgBIAEoCVINcmVxdWVzdE1ldGhvZBIfCgtyZXF1ZXN0X3VybBgCIAEoCVIKcmVxdWVzdFVybBIhCgxyZXF1ZXN0X3NpemUYAyABKANSC3JlcXVlc3RTaXplEhYKBnN0YXR1cxgEIAEoBVIGc3RhdHVzEiMKDXJlc3BvbnNlX3NpemUYBSABKANSDHJlc3BvbnNlU2l6ZRIdCgp1c2VyX2FnZW50GAYgASgJUgl1c2VyQWdlbnQSGwoJcmVtb3RlX2lwGAcgASgJUghyZW1vdGVJcBIbCglzZXJ2ZXJfaXAYDSABKAlSCHNlcnZlcklwEhgKB3JlZmVyZXIYCCABKAlSB3JlZmVyZXISMwoHbGF0ZW5jeRgOIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvblIHbGF0ZW5jeRIhCgxjYWNoZV9sb29rdXAYCyABKAhSC2NhY2hlTG9va3VwEhsKCWNhY2hlX2hpdBgJIAEoCFIIY2FjaGVIaXQSSgoiY2FjaGVfdmFsaWRhdGVkX3dpdGhfb3JpZ2luX3NlcnZlchgKIAEoCFIeY2FjaGVWYWxpZGF0ZWRXaXRoT3JpZ2luU2VydmVyEigKEGNhY2hlX2ZpbGxfYnl0ZXMYDCABKANSDmNhY2hlRmlsbEJ5dGVzEhoKCHByb3RvY29sGA8gASgJUghwcm90b2NvbA=='); diff --git a/example/googleapis/lib/src/generated/google/logging/type/log_severity.pb.dart b/example/googleapis/lib/src/generated/google/logging/type/log_severity.pb.dart index 68e84889..48a8d391 100644 --- a/example/googleapis/lib/src/generated/google/logging/type/log_severity.pb.dart +++ b/example/googleapis/lib/src/generated/google/logging/type/log_severity.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/logging/type/log_severity.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:core' as $core; diff --git a/example/googleapis/lib/src/generated/google/logging/type/log_severity.pbenum.dart b/example/googleapis/lib/src/generated/google/logging/type/log_severity.pbenum.dart index f63f7cdb..c940a793 100644 --- a/example/googleapis/lib/src/generated/google/logging/type/log_severity.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/logging/type/log_severity.pbenum.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/logging/type/log_severity.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields // ignore_for_file: UNDEFINED_SHOWN_NAME @@ -70,7 +70,7 @@ class LogSeverity extends $pb.ProtobufEnum { static final $core.Map<$core.int, LogSeverity> _byValue = $pb.ProtobufEnum.initByValue(values); - static LogSeverity valueOf($core.int value) => _byValue[value]; + static LogSeverity? valueOf($core.int value) => _byValue[value]; const LogSeverity._($core.int v, $core.String n) : super(v, n); } diff --git a/example/googleapis/lib/src/generated/google/logging/type/log_severity.pbjson.dart b/example/googleapis/lib/src/generated/google/logging/type/log_severity.pbjson.dart index 480f2e05..9550d49c 100644 --- a/example/googleapis/lib/src/generated/google/logging/type/log_severity.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/logging/type/log_severity.pbjson.dart @@ -2,9 +2,14 @@ // Generated code. Do not modify. // source: google/logging/type/log_severity.proto // -// @dart = 2.7 -// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package +import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; + +@$core.Deprecated('Use logSeverityDescriptor instead') const LogSeverity$json = const { '1': 'LogSeverity', '2': const [ @@ -19,3 +24,7 @@ const LogSeverity$json = const { const {'1': 'EMERGENCY', '2': 800}, ], }; + +/// Descriptor for `LogSeverity`. Decode as a `google.protobuf.EnumDescriptorProto`. +final $typed_data.Uint8List logSeverityDescriptor = $convert.base64Decode( + 'CgtMb2dTZXZlcml0eRILCgdERUZBVUxUEAASCQoFREVCVUcQZBIJCgRJTkZPEMgBEgsKBk5PVElDRRCsAhIMCgdXQVJOSU5HEJADEgoKBUVSUk9SEPQDEg0KCENSSVRJQ0FMENgEEgoKBUFMRVJUELwFEg4KCUVNRVJHRU5DWRCgBg=='); diff --git a/example/googleapis/lib/src/generated/google/logging/v2/log_entry.pb.dart b/example/googleapis/lib/src/generated/google/logging/v2/log_entry.pb.dart index 136fcdfe..5cd92ee8 100644 --- a/example/googleapis/lib/src/generated/google/logging/v2/log_entry.pb.dart +++ b/example/googleapis/lib/src/generated/google/logging/v2/log_entry.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/logging/v2/log_entry.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:core' as $core; @@ -137,22 +137,22 @@ class LogEntry extends $pb.GeneratedMessage { LogEntry._() : super(); factory LogEntry({ - $0.Any protoPayload, - $core.String textPayload, - $core.String insertId, - $1.Struct jsonPayload, - $2.HttpRequest httpRequest, - $3.MonitoredResource resource, - $4.Timestamp timestamp, - $5.LogSeverity severity, - $core.Map<$core.String, $core.String> labels, - $core.String logName, - LogEntryOperation operation, - $core.String trace, - LogEntrySourceLocation sourceLocation, - $4.Timestamp receiveTimestamp, - $core.String spanId, - $core.bool traceSampled, + $0.Any? protoPayload, + $core.String? textPayload, + $core.String? insertId, + $1.Struct? jsonPayload, + $2.HttpRequest? httpRequest, + $3.MonitoredResource? resource, + $4.Timestamp? timestamp, + $5.LogSeverity? severity, + $core.Map<$core.String, $core.String>? labels, + $core.String? logName, + LogEntryOperation? operation, + $core.String? trace, + LogEntrySourceLocation? sourceLocation, + $4.Timestamp? receiveTimestamp, + $core.String? spanId, + $core.bool? traceSampled, }) { final _result = create(); if (protoPayload != null) { @@ -219,8 +219,8 @@ class LogEntry extends $pb.GeneratedMessage { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') LogEntry copyWith(void Function(LogEntry) updates) => - super.copyWith((message) => - updates(message as LogEntry)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as LogEntry)) + as LogEntry; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static LogEntry create() => LogEntry._(); @@ -229,9 +229,9 @@ class LogEntry extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static LogEntry getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static LogEntry _defaultInstance; + static LogEntry? _defaultInstance; - LogEntry_Payload whichPayload() => _LogEntry_PayloadByTag[$_whichOneof(0)]; + LogEntry_Payload whichPayload() => _LogEntry_PayloadByTag[$_whichOneof(0)]!; void clearPayload() => clearField($_whichOneof(0)); @$pb.TagNumber(2) @@ -468,10 +468,10 @@ class LogEntryOperation extends $pb.GeneratedMessage { LogEntryOperation._() : super(); factory LogEntryOperation({ - $core.String id, - $core.String producer, - $core.bool first, - $core.bool last, + $core.String? id, + $core.String? producer, + $core.bool? first, + $core.bool? last, }) { final _result = create(); if (id != null) { @@ -502,8 +502,8 @@ class LogEntryOperation extends $pb.GeneratedMessage { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') LogEntryOperation copyWith(void Function(LogEntryOperation) updates) => - super.copyWith((message) => updates( - message as LogEntryOperation)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as LogEntryOperation)) + as LogEntryOperation; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static LogEntryOperation create() => LogEntryOperation._(); @@ -513,7 +513,7 @@ class LogEntryOperation extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static LogEntryOperation getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static LogEntryOperation _defaultInstance; + static LogEntryOperation? _defaultInstance; @$pb.TagNumber(1) $core.String get id => $_getSZ(0); @@ -593,9 +593,9 @@ class LogEntrySourceLocation extends $pb.GeneratedMessage { LogEntrySourceLocation._() : super(); factory LogEntrySourceLocation({ - $core.String file, - $fixnum.Int64 line, - $core.String function, + $core.String? file, + $fixnum.Int64? line, + $core.String? function, }) { final _result = create(); if (file != null) { @@ -625,8 +625,8 @@ class LogEntrySourceLocation extends $pb.GeneratedMessage { 'Will be removed in next major version') LogEntrySourceLocation copyWith( void Function(LogEntrySourceLocation) updates) => - super.copyWith((message) => updates( - message as LogEntrySourceLocation)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as LogEntrySourceLocation)) + as LogEntrySourceLocation; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static LogEntrySourceLocation create() => LogEntrySourceLocation._(); @@ -636,7 +636,7 @@ class LogEntrySourceLocation extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static LogEntrySourceLocation getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static LogEntrySourceLocation _defaultInstance; + static LogEntrySourceLocation? _defaultInstance; @$pb.TagNumber(1) $core.String get file => $_getSZ(0); diff --git a/example/googleapis/lib/src/generated/google/logging/v2/log_entry.pbenum.dart b/example/googleapis/lib/src/generated/google/logging/v2/log_entry.pbenum.dart index 26475f4b..24e070d5 100644 --- a/example/googleapis/lib/src/generated/google/logging/v2/log_entry.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/logging/v2/log_entry.pbenum.dart @@ -2,5 +2,5 @@ // Generated code. Do not modify. // source: google/logging/v2/log_entry.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields diff --git a/example/googleapis/lib/src/generated/google/logging/v2/log_entry.pbjson.dart b/example/googleapis/lib/src/generated/google/logging/v2/log_entry.pbjson.dart index 53b63765..e7bda7c5 100644 --- a/example/googleapis/lib/src/generated/google/logging/v2/log_entry.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/logging/v2/log_entry.pbjson.dart @@ -2,9 +2,14 @@ // Generated code. Do not modify. // source: google/logging/v2/log_entry.proto // -// @dart = 2.7 -// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package +import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; + +@$core.Deprecated('Use logEntryDescriptor instead') const LogEntry$json = const { '1': 'LogEntry', '2': const [ @@ -147,6 +152,7 @@ const LogEntry$json = const { ], }; +@$core.Deprecated('Use logEntryDescriptor instead') const LogEntry_LabelsEntry$json = const { '1': 'LabelsEntry', '2': const [ @@ -156,6 +162,10 @@ const LogEntry_LabelsEntry$json = const { '7': const {'7': true}, }; +/// Descriptor for `LogEntry`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List logEntryDescriptor = $convert.base64Decode( + 'CghMb2dFbnRyeRIeCghsb2dfbmFtZRgMIAEoCUID4EECUgdsb2dOYW1lEj4KCHJlc291cmNlGAggASgLMh0uZ29vZ2xlLmFwaS5Nb25pdG9yZWRSZXNvdXJjZUID4EECUghyZXNvdXJjZRI7Cg1wcm90b19wYXlsb2FkGAIgASgLMhQuZ29vZ2xlLnByb3RvYnVmLkFueUgAUgxwcm90b1BheWxvYWQSIwoMdGV4dF9wYXlsb2FkGAMgASgJSABSC3RleHRQYXlsb2FkEjwKDGpzb25fcGF5bG9hZBgGIAEoCzIXLmdvb2dsZS5wcm90b2J1Zi5TdHJ1Y3RIAFILanNvblBheWxvYWQSPQoJdGltZXN0YW1wGAkgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEBUgl0aW1lc3RhbXASTAoRcmVjZWl2ZV90aW1lc3RhbXAYGCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQNSEHJlY2VpdmVUaW1lc3RhbXASQQoIc2V2ZXJpdHkYCiABKA4yIC5nb29nbGUubG9nZ2luZy50eXBlLkxvZ1NldmVyaXR5QgPgQQFSCHNldmVyaXR5EiAKCWluc2VydF9pZBgEIAEoCUID4EEBUghpbnNlcnRJZBJICgxodHRwX3JlcXVlc3QYByABKAsyIC5nb29nbGUubG9nZ2luZy50eXBlLkh0dHBSZXF1ZXN0QgPgQQFSC2h0dHBSZXF1ZXN0EkQKBmxhYmVscxgLIAMoCzInLmdvb2dsZS5sb2dnaW5nLnYyLkxvZ0VudHJ5LkxhYmVsc0VudHJ5QgPgQQFSBmxhYmVscxJHCglvcGVyYXRpb24YDyABKAsyJC5nb29nbGUubG9nZ2luZy52Mi5Mb2dFbnRyeU9wZXJhdGlvbkID4EEBUglvcGVyYXRpb24SGQoFdHJhY2UYFiABKAlCA+BBAVIFdHJhY2USHAoHc3Bhbl9pZBgbIAEoCUID4EEBUgZzcGFuSWQSKAoNdHJhY2Vfc2FtcGxlZBgeIAEoCEID4EEBUgx0cmFjZVNhbXBsZWQSVwoPc291cmNlX2xvY2F0aW9uGBcgASgLMikuZ29vZ2xlLmxvZ2dpbmcudjIuTG9nRW50cnlTb3VyY2VMb2NhdGlvbkID4EEBUg5zb3VyY2VMb2NhdGlvbho5CgtMYWJlbHNFbnRyeRIQCgNrZXkYASABKAlSA2tleRIUCgV2YWx1ZRgCIAEoCVIFdmFsdWU6AjgBOr0B6kG5AQoabG9nZ2luZy5nb29nbGVhcGlzLmNvbS9Mb2cSHXByb2plY3RzL3twcm9qZWN0fS9sb2dzL3tsb2d9Eidvcmdhbml6YXRpb25zL3tvcmdhbml6YXRpb259L2xvZ3Mve2xvZ30SG2ZvbGRlcnMve2ZvbGRlcn0vbG9ncy97bG9nfRIsYmlsbGluZ0FjY291bnRzL3tiaWxsaW5nX2FjY291bnR9L2xvZ3Mve2xvZ30aCGxvZ19uYW1lQgkKB3BheWxvYWQ='); +@$core.Deprecated('Use logEntryOperationDescriptor instead') const LogEntryOperation$json = const { '1': 'LogEntryOperation', '2': const [ @@ -173,6 +183,10 @@ const LogEntryOperation$json = const { ], }; +/// Descriptor for `LogEntryOperation`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List logEntryOperationDescriptor = $convert.base64Decode( + 'ChFMb2dFbnRyeU9wZXJhdGlvbhITCgJpZBgBIAEoCUID4EEBUgJpZBIfCghwcm9kdWNlchgCIAEoCUID4EEBUghwcm9kdWNlchIZCgVmaXJzdBgDIAEoCEID4EEBUgVmaXJzdBIXCgRsYXN0GAQgASgIQgPgQQFSBGxhc3Q='); +@$core.Deprecated('Use logEntrySourceLocationDescriptor instead') const LogEntrySourceLocation$json = const { '1': 'LogEntrySourceLocation', '2': const [ @@ -188,3 +202,8 @@ const LogEntrySourceLocation$json = const { }, ], }; + +/// Descriptor for `LogEntrySourceLocation`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List logEntrySourceLocationDescriptor = + $convert.base64Decode( + 'ChZMb2dFbnRyeVNvdXJjZUxvY2F0aW9uEhcKBGZpbGUYASABKAlCA+BBAVIEZmlsZRIXCgRsaW5lGAIgASgDQgPgQQFSBGxpbmUSHwoIZnVuY3Rpb24YAyABKAlCA+BBAVIIZnVuY3Rpb24='); diff --git a/example/googleapis/lib/src/generated/google/logging/v2/logging.pb.dart b/example/googleapis/lib/src/generated/google/logging/v2/logging.pb.dart index 939933de..d32ac617 100644 --- a/example/googleapis/lib/src/generated/google/logging/v2/logging.pb.dart +++ b/example/googleapis/lib/src/generated/google/logging/v2/logging.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/logging/v2/logging.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:core' as $core; @@ -37,7 +37,7 @@ class DeleteLogRequest extends $pb.GeneratedMessage { DeleteLogRequest._() : super(); factory DeleteLogRequest({ - $core.String logName, + $core.String? logName, }) { final _result = create(); if (logName != null) { @@ -59,8 +59,8 @@ class DeleteLogRequest extends $pb.GeneratedMessage { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') DeleteLogRequest copyWith(void Function(DeleteLogRequest) updates) => - super.copyWith((message) => updates( - message as DeleteLogRequest)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as DeleteLogRequest)) + as DeleteLogRequest; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static DeleteLogRequest create() => DeleteLogRequest._(); @@ -70,7 +70,7 @@ class DeleteLogRequest extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static DeleteLogRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static DeleteLogRequest _defaultInstance; + static DeleteLogRequest? _defaultInstance; @$pb.TagNumber(1) $core.String get logName => $_getSZ(0); @@ -136,12 +136,12 @@ class WriteLogEntriesRequest extends $pb.GeneratedMessage { WriteLogEntriesRequest._() : super(); factory WriteLogEntriesRequest({ - $core.String logName, - $3.MonitoredResource resource, - $core.Map<$core.String, $core.String> labels, - $core.Iterable<$4.LogEntry> entries, - $core.bool partialSuccess, - $core.bool dryRun, + $core.String? logName, + $3.MonitoredResource? resource, + $core.Map<$core.String, $core.String>? labels, + $core.Iterable<$4.LogEntry>? entries, + $core.bool? partialSuccess, + $core.bool? dryRun, }) { final _result = create(); if (logName != null) { @@ -180,8 +180,8 @@ class WriteLogEntriesRequest extends $pb.GeneratedMessage { 'Will be removed in next major version') WriteLogEntriesRequest copyWith( void Function(WriteLogEntriesRequest) updates) => - super.copyWith((message) => updates( - message as WriteLogEntriesRequest)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as WriteLogEntriesRequest)) + as WriteLogEntriesRequest; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static WriteLogEntriesRequest create() => WriteLogEntriesRequest._(); @@ -191,7 +191,7 @@ class WriteLogEntriesRequest extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static WriteLogEntriesRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static WriteLogEntriesRequest _defaultInstance; + static WriteLogEntriesRequest? _defaultInstance; @$pb.TagNumber(1) $core.String get logName => $_getSZ(0); @@ -280,8 +280,8 @@ class WriteLogEntriesResponse extends $pb.GeneratedMessage { 'Will be removed in next major version') WriteLogEntriesResponse copyWith( void Function(WriteLogEntriesResponse) updates) => - super.copyWith((message) => updates( - message as WriteLogEntriesResponse)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as WriteLogEntriesResponse)) + as WriteLogEntriesResponse; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static WriteLogEntriesResponse create() => WriteLogEntriesResponse._(); @@ -291,7 +291,7 @@ class WriteLogEntriesResponse extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static WriteLogEntriesResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static WriteLogEntriesResponse _defaultInstance; + static WriteLogEntriesResponse? _defaultInstance; } class WriteLogEntriesPartialErrors extends $pb.GeneratedMessage { @@ -318,7 +318,7 @@ class WriteLogEntriesPartialErrors extends $pb.GeneratedMessage { WriteLogEntriesPartialErrors._() : super(); factory WriteLogEntriesPartialErrors({ - $core.Map<$core.int, $5.Status> logEntryErrors, + $core.Map<$core.int, $5.Status>? logEntryErrors, }) { final _result = create(); if (logEntryErrors != null) { @@ -342,8 +342,9 @@ class WriteLogEntriesPartialErrors extends $pb.GeneratedMessage { 'Will be removed in next major version') WriteLogEntriesPartialErrors copyWith( void Function(WriteLogEntriesPartialErrors) updates) => - super.copyWith((message) => updates(message - as WriteLogEntriesPartialErrors)); // ignore: deprecated_member_use + super.copyWith( + (message) => updates(message as WriteLogEntriesPartialErrors)) + as WriteLogEntriesPartialErrors; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static WriteLogEntriesPartialErrors create() => @@ -354,7 +355,7 @@ class WriteLogEntriesPartialErrors extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static WriteLogEntriesPartialErrors getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static WriteLogEntriesPartialErrors _defaultInstance; + static WriteLogEntriesPartialErrors? _defaultInstance; @$pb.TagNumber(1) $core.Map<$core.int, $5.Status> get logEntryErrors => $_getMap(0); @@ -400,11 +401,11 @@ class ListLogEntriesRequest extends $pb.GeneratedMessage { ListLogEntriesRequest._() : super(); factory ListLogEntriesRequest({ - $core.String filter, - $core.String orderBy, - $core.int pageSize, - $core.String pageToken, - $core.Iterable<$core.String> resourceNames, + $core.String? filter, + $core.String? orderBy, + $core.int? pageSize, + $core.String? pageToken, + $core.Iterable<$core.String>? resourceNames, }) { final _result = create(); if (filter != null) { @@ -440,8 +441,8 @@ class ListLogEntriesRequest extends $pb.GeneratedMessage { 'Will be removed in next major version') ListLogEntriesRequest copyWith( void Function(ListLogEntriesRequest) updates) => - super.copyWith((message) => updates( - message as ListLogEntriesRequest)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as ListLogEntriesRequest)) + as ListLogEntriesRequest; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static ListLogEntriesRequest create() => ListLogEntriesRequest._(); @@ -451,7 +452,7 @@ class ListLogEntriesRequest extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static ListLogEntriesRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static ListLogEntriesRequest _defaultInstance; + static ListLogEntriesRequest? _defaultInstance; @$pb.TagNumber(2) $core.String get filter => $_getSZ(0); @@ -531,8 +532,8 @@ class ListLogEntriesResponse extends $pb.GeneratedMessage { ListLogEntriesResponse._() : super(); factory ListLogEntriesResponse({ - $core.Iterable<$4.LogEntry> entries, - $core.String nextPageToken, + $core.Iterable<$4.LogEntry>? entries, + $core.String? nextPageToken, }) { final _result = create(); if (entries != null) { @@ -559,8 +560,8 @@ class ListLogEntriesResponse extends $pb.GeneratedMessage { 'Will be removed in next major version') ListLogEntriesResponse copyWith( void Function(ListLogEntriesResponse) updates) => - super.copyWith((message) => updates( - message as ListLogEntriesResponse)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as ListLogEntriesResponse)) + as ListLogEntriesResponse; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static ListLogEntriesResponse create() => ListLogEntriesResponse._(); @@ -570,7 +571,7 @@ class ListLogEntriesResponse extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static ListLogEntriesResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static ListLogEntriesResponse _defaultInstance; + static ListLogEntriesResponse? _defaultInstance; @$pb.TagNumber(1) $core.List<$4.LogEntry> get entries => $_getList(0); @@ -613,8 +614,8 @@ class ListMonitoredResourceDescriptorsRequest extends $pb.GeneratedMessage { ListMonitoredResourceDescriptorsRequest._() : super(); factory ListMonitoredResourceDescriptorsRequest({ - $core.int pageSize, - $core.String pageToken, + $core.int? pageSize, + $core.String? pageToken, }) { final _result = create(); if (pageSize != null) { @@ -642,8 +643,9 @@ class ListMonitoredResourceDescriptorsRequest extends $pb.GeneratedMessage { 'Will be removed in next major version') ListMonitoredResourceDescriptorsRequest copyWith( void Function(ListMonitoredResourceDescriptorsRequest) updates) => - super.copyWith((message) => updates(message - as ListMonitoredResourceDescriptorsRequest)); // ignore: deprecated_member_use + super.copyWith((message) => + updates(message as ListMonitoredResourceDescriptorsRequest)) + as ListMonitoredResourceDescriptorsRequest; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static ListMonitoredResourceDescriptorsRequest create() => @@ -655,7 +657,7 @@ class ListMonitoredResourceDescriptorsRequest extends $pb.GeneratedMessage { static ListMonitoredResourceDescriptorsRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor< ListMonitoredResourceDescriptorsRequest>(create); - static ListMonitoredResourceDescriptorsRequest _defaultInstance; + static ListMonitoredResourceDescriptorsRequest? _defaultInstance; @$pb.TagNumber(1) $core.int get pageSize => $_getIZ(0); @@ -708,8 +710,8 @@ class ListMonitoredResourceDescriptorsResponse extends $pb.GeneratedMessage { ListMonitoredResourceDescriptorsResponse._() : super(); factory ListMonitoredResourceDescriptorsResponse({ - $core.Iterable<$3.MonitoredResourceDescriptor> resourceDescriptors, - $core.String nextPageToken, + $core.Iterable<$3.MonitoredResourceDescriptor>? resourceDescriptors, + $core.String? nextPageToken, }) { final _result = create(); if (resourceDescriptors != null) { @@ -737,8 +739,9 @@ class ListMonitoredResourceDescriptorsResponse extends $pb.GeneratedMessage { 'Will be removed in next major version') ListMonitoredResourceDescriptorsResponse copyWith( void Function(ListMonitoredResourceDescriptorsResponse) updates) => - super.copyWith((message) => updates(message - as ListMonitoredResourceDescriptorsResponse)); // ignore: deprecated_member_use + super.copyWith((message) => + updates(message as ListMonitoredResourceDescriptorsResponse)) + as ListMonitoredResourceDescriptorsResponse; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static ListMonitoredResourceDescriptorsResponse create() => @@ -751,7 +754,7 @@ class ListMonitoredResourceDescriptorsResponse extends $pb.GeneratedMessage { static ListMonitoredResourceDescriptorsResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor< ListMonitoredResourceDescriptorsResponse>(create); - static ListMonitoredResourceDescriptorsResponse _defaultInstance; + static ListMonitoredResourceDescriptorsResponse? _defaultInstance; @$pb.TagNumber(1) $core.List<$3.MonitoredResourceDescriptor> get resourceDescriptors => @@ -805,10 +808,10 @@ class ListLogsRequest extends $pb.GeneratedMessage { ListLogsRequest._() : super(); factory ListLogsRequest({ - $core.String parent, - $core.int pageSize, - $core.String pageToken, - $core.Iterable<$core.String> resourceNames, + $core.String? parent, + $core.int? pageSize, + $core.String? pageToken, + $core.Iterable<$core.String>? resourceNames, }) { final _result = create(); if (parent != null) { @@ -839,8 +842,8 @@ class ListLogsRequest extends $pb.GeneratedMessage { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') ListLogsRequest copyWith(void Function(ListLogsRequest) updates) => - super.copyWith((message) => - updates(message as ListLogsRequest)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as ListLogsRequest)) + as ListLogsRequest; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static ListLogsRequest create() => ListLogsRequest._(); @@ -850,7 +853,7 @@ class ListLogsRequest extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static ListLogsRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static ListLogsRequest _defaultInstance; + static ListLogsRequest? _defaultInstance; @$pb.TagNumber(1) $core.String get parent => $_getSZ(0); @@ -916,8 +919,8 @@ class ListLogsResponse extends $pb.GeneratedMessage { ListLogsResponse._() : super(); factory ListLogsResponse({ - $core.String nextPageToken, - $core.Iterable<$core.String> logNames, + $core.String? nextPageToken, + $core.Iterable<$core.String>? logNames, }) { final _result = create(); if (nextPageToken != null) { @@ -942,8 +945,8 @@ class ListLogsResponse extends $pb.GeneratedMessage { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') ListLogsResponse copyWith(void Function(ListLogsResponse) updates) => - super.copyWith((message) => updates( - message as ListLogsResponse)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as ListLogsResponse)) + as ListLogsResponse; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static ListLogsResponse create() => ListLogsResponse._(); @@ -953,7 +956,7 @@ class ListLogsResponse extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static ListLogsResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static ListLogsResponse _defaultInstance; + static ListLogsResponse? _defaultInstance; @$pb.TagNumber(2) $core.String get nextPageToken => $_getSZ(0); @@ -1001,9 +1004,9 @@ class TailLogEntriesRequest extends $pb.GeneratedMessage { TailLogEntriesRequest._() : super(); factory TailLogEntriesRequest({ - $core.Iterable<$core.String> resourceNames, - $core.String filter, - $6.Duration bufferWindow, + $core.Iterable<$core.String>? resourceNames, + $core.String? filter, + $6.Duration? bufferWindow, }) { final _result = create(); if (resourceNames != null) { @@ -1033,8 +1036,8 @@ class TailLogEntriesRequest extends $pb.GeneratedMessage { 'Will be removed in next major version') TailLogEntriesRequest copyWith( void Function(TailLogEntriesRequest) updates) => - super.copyWith((message) => updates( - message as TailLogEntriesRequest)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as TailLogEntriesRequest)) + as TailLogEntriesRequest; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static TailLogEntriesRequest create() => TailLogEntriesRequest._(); @@ -1044,7 +1047,7 @@ class TailLogEntriesRequest extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static TailLogEntriesRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static TailLogEntriesRequest _defaultInstance; + static TailLogEntriesRequest? _defaultInstance; @$pb.TagNumber(1) $core.List<$core.String> get resourceNames => $_getList(0); @@ -1106,8 +1109,8 @@ class TailLogEntriesResponse_SuppressionInfo extends $pb.GeneratedMessage { TailLogEntriesResponse_SuppressionInfo._() : super(); factory TailLogEntriesResponse_SuppressionInfo({ - TailLogEntriesResponse_SuppressionInfo_Reason reason, - $core.int suppressedCount, + TailLogEntriesResponse_SuppressionInfo_Reason? reason, + $core.int? suppressedCount, }) { final _result = create(); if (reason != null) { @@ -1135,8 +1138,9 @@ class TailLogEntriesResponse_SuppressionInfo extends $pb.GeneratedMessage { 'Will be removed in next major version') TailLogEntriesResponse_SuppressionInfo copyWith( void Function(TailLogEntriesResponse_SuppressionInfo) updates) => - super.copyWith((message) => updates(message - as TailLogEntriesResponse_SuppressionInfo)); // ignore: deprecated_member_use + super.copyWith((message) => + updates(message as TailLogEntriesResponse_SuppressionInfo)) + as TailLogEntriesResponse_SuppressionInfo; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static TailLogEntriesResponse_SuppressionInfo create() => @@ -1148,7 +1152,7 @@ class TailLogEntriesResponse_SuppressionInfo extends $pb.GeneratedMessage { static TailLogEntriesResponse_SuppressionInfo getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor< TailLogEntriesResponse_SuppressionInfo>(create); - static TailLogEntriesResponse_SuppressionInfo _defaultInstance; + static TailLogEntriesResponse_SuppressionInfo? _defaultInstance; @$pb.TagNumber(1) TailLogEntriesResponse_SuppressionInfo_Reason get reason => $_getN(0); @@ -1203,8 +1207,8 @@ class TailLogEntriesResponse extends $pb.GeneratedMessage { TailLogEntriesResponse._() : super(); factory TailLogEntriesResponse({ - $core.Iterable<$4.LogEntry> entries, - $core.Iterable suppressionInfo, + $core.Iterable<$4.LogEntry>? entries, + $core.Iterable? suppressionInfo, }) { final _result = create(); if (entries != null) { @@ -1231,8 +1235,8 @@ class TailLogEntriesResponse extends $pb.GeneratedMessage { 'Will be removed in next major version') TailLogEntriesResponse copyWith( void Function(TailLogEntriesResponse) updates) => - super.copyWith((message) => updates( - message as TailLogEntriesResponse)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as TailLogEntriesResponse)) + as TailLogEntriesResponse; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static TailLogEntriesResponse create() => TailLogEntriesResponse._(); @@ -1242,7 +1246,7 @@ class TailLogEntriesResponse extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static TailLogEntriesResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static TailLogEntriesResponse _defaultInstance; + static TailLogEntriesResponse? _defaultInstance; @$pb.TagNumber(1) $core.List<$4.LogEntry> get entries => $_getList(0); diff --git a/example/googleapis/lib/src/generated/google/logging/v2/logging.pbenum.dart b/example/googleapis/lib/src/generated/google/logging/v2/logging.pbenum.dart index 1172f676..12fdd560 100644 --- a/example/googleapis/lib/src/generated/google/logging/v2/logging.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/logging/v2/logging.pbenum.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/logging/v2/logging.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields // ignore_for_file: UNDEFINED_SHOWN_NAME @@ -39,7 +39,7 @@ class TailLogEntriesResponse_SuppressionInfo_Reason extends $pb.ProtobufEnum { static final $core .Map<$core.int, TailLogEntriesResponse_SuppressionInfo_Reason> _byValue = $pb.ProtobufEnum.initByValue(values); - static TailLogEntriesResponse_SuppressionInfo_Reason valueOf( + static TailLogEntriesResponse_SuppressionInfo_Reason? valueOf( $core.int value) => _byValue[value]; diff --git a/example/googleapis/lib/src/generated/google/logging/v2/logging.pbgrpc.dart b/example/googleapis/lib/src/generated/google/logging/v2/logging.pbgrpc.dart index 0aad83b8..c549eb5b 100644 --- a/example/googleapis/lib/src/generated/google/logging/v2/logging.pbgrpc.dart +++ b/example/googleapis/lib/src/generated/google/logging/v2/logging.pbgrpc.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/logging/v2/logging.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:async' as $async; @@ -53,43 +53,43 @@ class LoggingServiceV2Client extends $grpc.Client { $2.TailLogEntriesResponse.fromBuffer(value)); LoggingServiceV2Client($grpc.ClientChannel channel, - {$grpc.CallOptions options, - $core.Iterable<$grpc.ClientInterceptor> interceptors}) + {$grpc.CallOptions? options, + $core.Iterable<$grpc.ClientInterceptor>? interceptors}) : super(channel, options: options, interceptors: interceptors); $grpc.ResponseFuture<$1.Empty> deleteLog($2.DeleteLogRequest request, - {$grpc.CallOptions options}) { + {$grpc.CallOptions? options}) { return $createUnaryCall(_$deleteLog, request, options: options); } $grpc.ResponseFuture<$2.WriteLogEntriesResponse> writeLogEntries( $2.WriteLogEntriesRequest request, - {$grpc.CallOptions options}) { + {$grpc.CallOptions? options}) { return $createUnaryCall(_$writeLogEntries, request, options: options); } $grpc.ResponseFuture<$2.ListLogEntriesResponse> listLogEntries( $2.ListLogEntriesRequest request, - {$grpc.CallOptions options}) { + {$grpc.CallOptions? options}) { return $createUnaryCall(_$listLogEntries, request, options: options); } $grpc.ResponseFuture<$2.ListMonitoredResourceDescriptorsResponse> listMonitoredResourceDescriptors( $2.ListMonitoredResourceDescriptorsRequest request, - {$grpc.CallOptions options}) { + {$grpc.CallOptions? options}) { return $createUnaryCall(_$listMonitoredResourceDescriptors, request, options: options); } $grpc.ResponseFuture<$2.ListLogsResponse> listLogs($2.ListLogsRequest request, - {$grpc.CallOptions options}) { + {$grpc.CallOptions? options}) { return $createUnaryCall(_$listLogs, request, options: options); } $grpc.ResponseStream<$2.TailLogEntriesResponse> tailLogEntries( $async.Stream<$2.TailLogEntriesRequest> request, - {$grpc.CallOptions options}) { + {$grpc.CallOptions? options}) { return $createStreamingCall(_$tailLogEntries, request, options: options); } } diff --git a/example/googleapis/lib/src/generated/google/logging/v2/logging.pbjson.dart b/example/googleapis/lib/src/generated/google/logging/v2/logging.pbjson.dart index aa646286..be526b10 100644 --- a/example/googleapis/lib/src/generated/google/logging/v2/logging.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/logging/v2/logging.pbjson.dart @@ -2,9 +2,14 @@ // Generated code. Do not modify. // source: google/logging/v2/logging.proto // -// @dart = 2.7 -// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package +import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; + +@$core.Deprecated('Use deleteLogRequestDescriptor instead') const DeleteLogRequest$json = const { '1': 'DeleteLogRequest', '2': const [ @@ -19,6 +24,10 @@ const DeleteLogRequest$json = const { ], }; +/// Descriptor for `DeleteLogRequest`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List deleteLogRequestDescriptor = $convert.base64Decode( + 'ChBEZWxldGVMb2dSZXF1ZXN0Ej0KCGxvZ19uYW1lGAEgASgJQiLgQQL6QRwKGmxvZ2dpbmcuZ29vZ2xlYXBpcy5jb20vTG9nUgdsb2dOYW1l'); +@$core.Deprecated('Use writeLogEntriesRequestDescriptor instead') const WriteLogEntriesRequest$json = const { '1': 'WriteLogEntriesRequest', '2': const [ @@ -77,6 +86,7 @@ const WriteLogEntriesRequest$json = const { '3': const [WriteLogEntriesRequest_LabelsEntry$json], }; +@$core.Deprecated('Use writeLogEntriesRequestDescriptor instead') const WriteLogEntriesRequest_LabelsEntry$json = const { '1': 'LabelsEntry', '2': const [ @@ -86,10 +96,19 @@ const WriteLogEntriesRequest_LabelsEntry$json = const { '7': const {'7': true}, }; +/// Descriptor for `WriteLogEntriesRequest`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List writeLogEntriesRequestDescriptor = + $convert.base64Decode( + 'ChZXcml0ZUxvZ0VudHJpZXNSZXF1ZXN0Ej0KCGxvZ19uYW1lGAEgASgJQiLgQQH6QRwKGmxvZ2dpbmcuZ29vZ2xlYXBpcy5jb20vTG9nUgdsb2dOYW1lEj4KCHJlc291cmNlGAIgASgLMh0uZ29vZ2xlLmFwaS5Nb25pdG9yZWRSZXNvdXJjZUID4EEBUghyZXNvdXJjZRJSCgZsYWJlbHMYAyADKAsyNS5nb29nbGUubG9nZ2luZy52Mi5Xcml0ZUxvZ0VudHJpZXNSZXF1ZXN0LkxhYmVsc0VudHJ5QgPgQQFSBmxhYmVscxI6CgdlbnRyaWVzGAQgAygLMhsuZ29vZ2xlLmxvZ2dpbmcudjIuTG9nRW50cnlCA+BBAlIHZW50cmllcxIsCg9wYXJ0aWFsX3N1Y2Nlc3MYBSABKAhCA+BBAVIOcGFydGlhbFN1Y2Nlc3MSHAoHZHJ5X3J1bhgGIAEoCEID4EEBUgZkcnlSdW4aOQoLTGFiZWxzRW50cnkSEAoDa2V5GAEgASgJUgNrZXkSFAoFdmFsdWUYAiABKAlSBXZhbHVlOgI4AQ=='); +@$core.Deprecated('Use writeLogEntriesResponseDescriptor instead') const WriteLogEntriesResponse$json = const { '1': 'WriteLogEntriesResponse', }; +/// Descriptor for `WriteLogEntriesResponse`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List writeLogEntriesResponseDescriptor = + $convert.base64Decode('ChdXcml0ZUxvZ0VudHJpZXNSZXNwb25zZQ=='); +@$core.Deprecated('Use writeLogEntriesPartialErrorsDescriptor instead') const WriteLogEntriesPartialErrors$json = const { '1': 'WriteLogEntriesPartialErrors', '2': const [ @@ -106,6 +125,7 @@ const WriteLogEntriesPartialErrors$json = const { '3': const [WriteLogEntriesPartialErrors_LogEntryErrorsEntry$json], }; +@$core.Deprecated('Use writeLogEntriesPartialErrorsDescriptor instead') const WriteLogEntriesPartialErrors_LogEntryErrorsEntry$json = const { '1': 'LogEntryErrorsEntry', '2': const [ @@ -122,6 +142,11 @@ const WriteLogEntriesPartialErrors_LogEntryErrorsEntry$json = const { '7': const {'7': true}, }; +/// Descriptor for `WriteLogEntriesPartialErrors`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List writeLogEntriesPartialErrorsDescriptor = + $convert.base64Decode( + 'ChxXcml0ZUxvZ0VudHJpZXNQYXJ0aWFsRXJyb3JzEm0KEGxvZ19lbnRyeV9lcnJvcnMYASADKAsyQy5nb29nbGUubG9nZ2luZy52Mi5Xcml0ZUxvZ0VudHJpZXNQYXJ0aWFsRXJyb3JzLkxvZ0VudHJ5RXJyb3JzRW50cnlSDmxvZ0VudHJ5RXJyb3JzGlUKE0xvZ0VudHJ5RXJyb3JzRW50cnkSEAoDa2V5GAEgASgFUgNrZXkSKAoFdmFsdWUYAiABKAsyEi5nb29nbGUucnBjLlN0YXR1c1IFdmFsdWU6AjgB'); +@$core.Deprecated('Use listLogEntriesRequestDescriptor instead') const ListLogEntriesRequest$json = const { '1': 'ListLogEntriesRequest', '2': const [ @@ -168,6 +193,10 @@ const ListLogEntriesRequest$json = const { ], }; +/// Descriptor for `ListLogEntriesRequest`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List listLogEntriesRequestDescriptor = $convert.base64Decode( + 'ChVMaXN0TG9nRW50cmllc1JlcXVlc3QSSQoOcmVzb3VyY2VfbmFtZXMYCCADKAlCIuBBAvpBHBIabG9nZ2luZy5nb29nbGVhcGlzLmNvbS9Mb2dSDXJlc291cmNlTmFtZXMSGwoGZmlsdGVyGAIgASgJQgPgQQFSBmZpbHRlchIeCghvcmRlcl9ieRgDIAEoCUID4EEBUgdvcmRlckJ5EiAKCXBhZ2Vfc2l6ZRgEIAEoBUID4EEBUghwYWdlU2l6ZRIiCgpwYWdlX3Rva2VuGAUgASgJQgPgQQFSCXBhZ2VUb2tlbg=='); +@$core.Deprecated('Use listLogEntriesResponseDescriptor instead') const ListLogEntriesResponse$json = const { '1': 'ListLogEntriesResponse', '2': const [ @@ -189,6 +218,12 @@ const ListLogEntriesResponse$json = const { ], }; +/// Descriptor for `ListLogEntriesResponse`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List listLogEntriesResponseDescriptor = + $convert.base64Decode( + 'ChZMaXN0TG9nRW50cmllc1Jlc3BvbnNlEjUKB2VudHJpZXMYASADKAsyGy5nb29nbGUubG9nZ2luZy52Mi5Mb2dFbnRyeVIHZW50cmllcxImCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAlSDW5leHRQYWdlVG9rZW4='); +@$core + .Deprecated('Use listMonitoredResourceDescriptorsRequestDescriptor instead') const ListMonitoredResourceDescriptorsRequest$json = const { '1': 'ListMonitoredResourceDescriptorsRequest', '2': const [ @@ -211,6 +246,12 @@ const ListMonitoredResourceDescriptorsRequest$json = const { ], }; +/// Descriptor for `ListMonitoredResourceDescriptorsRequest`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List listMonitoredResourceDescriptorsRequestDescriptor = + $convert.base64Decode( + 'CidMaXN0TW9uaXRvcmVkUmVzb3VyY2VEZXNjcmlwdG9yc1JlcXVlc3QSIAoJcGFnZV9zaXplGAEgASgFQgPgQQFSCHBhZ2VTaXplEiIKCnBhZ2VfdG9rZW4YAiABKAlCA+BBAVIJcGFnZVRva2Vu'); +@$core.Deprecated( + 'Use listMonitoredResourceDescriptorsResponseDescriptor instead') const ListMonitoredResourceDescriptorsResponse$json = const { '1': 'ListMonitoredResourceDescriptorsResponse', '2': const [ @@ -232,6 +273,11 @@ const ListMonitoredResourceDescriptorsResponse$json = const { ], }; +/// Descriptor for `ListMonitoredResourceDescriptorsResponse`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List listMonitoredResourceDescriptorsResponseDescriptor = + $convert.base64Decode( + 'CihMaXN0TW9uaXRvcmVkUmVzb3VyY2VEZXNjcmlwdG9yc1Jlc3BvbnNlEloKFHJlc291cmNlX2Rlc2NyaXB0b3JzGAEgAygLMicuZ29vZ2xlLmFwaS5Nb25pdG9yZWRSZXNvdXJjZURlc2NyaXB0b3JSE3Jlc291cmNlRGVzY3JpcHRvcnMSJgoPbmV4dF9wYWdlX3Rva2VuGAIgASgJUg1uZXh0UGFnZVRva2Vu'); +@$core.Deprecated('Use listLogsRequestDescriptor instead') const ListLogsRequest$json = const { '1': 'ListLogsRequest', '2': const [ @@ -270,6 +316,10 @@ const ListLogsRequest$json = const { ], }; +/// Descriptor for `ListLogsRequest`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List listLogsRequestDescriptor = $convert.base64Decode( + 'Cg9MaXN0TG9nc1JlcXVlc3QSOgoGcGFyZW50GAEgASgJQiLgQQL6QRwSGmxvZ2dpbmcuZ29vZ2xlYXBpcy5jb20vTG9nUgZwYXJlbnQSIAoJcGFnZV9zaXplGAIgASgFQgPgQQFSCHBhZ2VTaXplEiIKCnBhZ2VfdG9rZW4YAyABKAlCA+BBAVIJcGFnZVRva2VuEioKDnJlc291cmNlX25hbWVzGAggAygJQgPgQQFSDXJlc291cmNlTmFtZXM='); +@$core.Deprecated('Use listLogsResponseDescriptor instead') const ListLogsResponse$json = const { '1': 'ListLogsResponse', '2': const [ @@ -284,6 +334,10 @@ const ListLogsResponse$json = const { ], }; +/// Descriptor for `ListLogsResponse`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List listLogsResponseDescriptor = $convert.base64Decode( + 'ChBMaXN0TG9nc1Jlc3BvbnNlEhsKCWxvZ19uYW1lcxgDIAMoCVIIbG9nTmFtZXMSJgoPbmV4dF9wYWdlX3Rva2VuGAIgASgJUg1uZXh0UGFnZVRva2Vu'); +@$core.Deprecated('Use tailLogEntriesRequestDescriptor instead') const TailLogEntriesRequest$json = const { '1': 'TailLogEntriesRequest', '2': const [ @@ -315,6 +369,10 @@ const TailLogEntriesRequest$json = const { ], }; +/// Descriptor for `TailLogEntriesRequest`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List tailLogEntriesRequestDescriptor = $convert.base64Decode( + 'ChVUYWlsTG9nRW50cmllc1JlcXVlc3QSKgoOcmVzb3VyY2VfbmFtZXMYASADKAlCA+BBAlINcmVzb3VyY2VOYW1lcxIbCgZmaWx0ZXIYAiABKAlCA+BBAVIGZmlsdGVyEkMKDWJ1ZmZlcl93aW5kb3cYAyABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb25CA+BBAVIMYnVmZmVyV2luZG93'); +@$core.Deprecated('Use tailLogEntriesResponseDescriptor instead') const TailLogEntriesResponse$json = const { '1': 'TailLogEntriesResponse', '2': const [ @@ -338,6 +396,7 @@ const TailLogEntriesResponse$json = const { '3': const [TailLogEntriesResponse_SuppressionInfo$json], }; +@$core.Deprecated('Use tailLogEntriesResponseDescriptor instead') const TailLogEntriesResponse_SuppressionInfo$json = const { '1': 'SuppressionInfo', '2': const [ @@ -360,6 +419,7 @@ const TailLogEntriesResponse_SuppressionInfo$json = const { '4': const [TailLogEntriesResponse_SuppressionInfo_Reason$json], }; +@$core.Deprecated('Use tailLogEntriesResponseDescriptor instead') const TailLogEntriesResponse_SuppressionInfo_Reason$json = const { '1': 'Reason', '2': const [ @@ -368,3 +428,8 @@ const TailLogEntriesResponse_SuppressionInfo_Reason$json = const { const {'1': 'NOT_CONSUMED', '2': 2}, ], }; + +/// Descriptor for `TailLogEntriesResponse`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List tailLogEntriesResponseDescriptor = + $convert.base64Decode( + 'ChZUYWlsTG9nRW50cmllc1Jlc3BvbnNlEjUKB2VudHJpZXMYASADKAsyGy5nb29nbGUubG9nZ2luZy52Mi5Mb2dFbnRyeVIHZW50cmllcxJkChBzdXBwcmVzc2lvbl9pbmZvGAIgAygLMjkuZ29vZ2xlLmxvZ2dpbmcudjIuVGFpbExvZ0VudHJpZXNSZXNwb25zZS5TdXBwcmVzc2lvbkluZm9SD3N1cHByZXNzaW9uSW5mbxraAQoPU3VwcHJlc3Npb25JbmZvElgKBnJlYXNvbhgBIAEoDjJALmdvb2dsZS5sb2dnaW5nLnYyLlRhaWxMb2dFbnRyaWVzUmVzcG9uc2UuU3VwcHJlc3Npb25JbmZvLlJlYXNvblIGcmVhc29uEikKEHN1cHByZXNzZWRfY291bnQYAiABKAVSD3N1cHByZXNzZWRDb3VudCJCCgZSZWFzb24SFgoSUkVBU09OX1VOU1BFQ0lGSUVEEAASDgoKUkFURV9MSU1JVBABEhAKDE5PVF9DT05TVU1FRBAC'); diff --git a/example/googleapis/lib/src/generated/google/protobuf/any.pb.dart b/example/googleapis/lib/src/generated/google/protobuf/any.pb.dart index 42c5cc21..81fcf726 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/any.pb.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/any.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/protobuf/any.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:core' as $core; @@ -38,8 +38,8 @@ class Any extends $pb.GeneratedMessage with $mixin.AnyMixin { Any._() : super(); factory Any({ - $core.String typeUrl, - $core.List<$core.int> value, + $core.String? typeUrl, + $core.List<$core.int>? value, }) { final _result = create(); if (typeUrl != null) { @@ -63,8 +63,9 @@ class Any extends $pb.GeneratedMessage with $mixin.AnyMixin { @$core.Deprecated('Using this can add significant overhead to your binary. ' 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') - Any copyWith(void Function(Any) updates) => super.copyWith( - (message) => updates(message as Any)); // ignore: deprecated_member_use + Any copyWith(void Function(Any) updates) => + super.copyWith((message) => updates(message as Any)) + as Any; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Any create() => Any._(); @@ -73,7 +74,7 @@ class Any extends $pb.GeneratedMessage with $mixin.AnyMixin { @$core.pragma('dart2js:noInline') static Any getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Any _defaultInstance; + static Any? _defaultInstance; @$pb.TagNumber(1) $core.String get typeUrl => $_getSZ(0); diff --git a/example/googleapis/lib/src/generated/google/protobuf/any.pbenum.dart b/example/googleapis/lib/src/generated/google/protobuf/any.pbenum.dart index bdb145d0..e03f029c 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/any.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/any.pbenum.dart @@ -2,5 +2,5 @@ // Generated code. Do not modify. // source: google/protobuf/any.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields diff --git a/example/googleapis/lib/src/generated/google/protobuf/any.pbjson.dart b/example/googleapis/lib/src/generated/google/protobuf/any.pbjson.dart index 2ac5a10a..1ad2e301 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/any.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/any.pbjson.dart @@ -2,9 +2,14 @@ // Generated code. Do not modify. // source: google/protobuf/any.proto // -// @dart = 2.7 -// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package +import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; + +@$core.Deprecated('Use anyDescriptor instead') const Any$json = const { '1': 'Any', '2': const [ @@ -12,3 +17,7 @@ const Any$json = const { const {'1': 'value', '3': 2, '4': 1, '5': 12, '10': 'value'}, ], }; + +/// Descriptor for `Any`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List anyDescriptor = $convert.base64Decode( + 'CgNBbnkSGQoIdHlwZV91cmwYASABKAlSB3R5cGVVcmwSFAoFdmFsdWUYAiABKAxSBXZhbHVl'); diff --git a/example/googleapis/lib/src/generated/google/protobuf/duration.pb.dart b/example/googleapis/lib/src/generated/google/protobuf/duration.pb.dart index ab3e5c3b..07338766 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/duration.pb.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/duration.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/protobuf/duration.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:core' as $core; @@ -39,8 +39,8 @@ class Duration extends $pb.GeneratedMessage with $mixin.DurationMixin { Duration._() : super(); factory Duration({ - $fixnum.Int64 seconds, - $core.int nanos, + $fixnum.Int64? seconds, + $core.int? nanos, }) { final _result = create(); if (seconds != null) { @@ -65,8 +65,8 @@ class Duration extends $pb.GeneratedMessage with $mixin.DurationMixin { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') Duration copyWith(void Function(Duration) updates) => - super.copyWith((message) => - updates(message as Duration)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as Duration)) + as Duration; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Duration create() => Duration._(); @@ -75,7 +75,7 @@ class Duration extends $pb.GeneratedMessage with $mixin.DurationMixin { @$core.pragma('dart2js:noInline') static Duration getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Duration _defaultInstance; + static Duration? _defaultInstance; @$pb.TagNumber(1) $fixnum.Int64 get seconds => $_getI64(0); diff --git a/example/googleapis/lib/src/generated/google/protobuf/duration.pbenum.dart b/example/googleapis/lib/src/generated/google/protobuf/duration.pbenum.dart index a8c65832..af4119e7 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/duration.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/duration.pbenum.dart @@ -2,5 +2,5 @@ // Generated code. Do not modify. // source: google/protobuf/duration.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields diff --git a/example/googleapis/lib/src/generated/google/protobuf/duration.pbjson.dart b/example/googleapis/lib/src/generated/google/protobuf/duration.pbjson.dart index 641c1865..ef0dcc64 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/duration.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/duration.pbjson.dart @@ -2,9 +2,14 @@ // Generated code. Do not modify. // source: google/protobuf/duration.proto // -// @dart = 2.7 -// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package +import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; + +@$core.Deprecated('Use durationDescriptor instead') const Duration$json = const { '1': 'Duration', '2': const [ @@ -12,3 +17,7 @@ const Duration$json = const { const {'1': 'nanos', '3': 2, '4': 1, '5': 5, '10': 'nanos'}, ], }; + +/// Descriptor for `Duration`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List durationDescriptor = $convert.base64Decode( + 'CghEdXJhdGlvbhIYCgdzZWNvbmRzGAEgASgDUgdzZWNvbmRzEhQKBW5hbm9zGAIgASgFUgVuYW5vcw=='); diff --git a/example/googleapis/lib/src/generated/google/protobuf/empty.pb.dart b/example/googleapis/lib/src/generated/google/protobuf/empty.pb.dart index 6d5b620f..fda8ba1d 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/empty.pb.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/empty.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/protobuf/empty.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:core' as $core; @@ -36,8 +36,9 @@ class Empty extends $pb.GeneratedMessage { @$core.Deprecated('Using this can add significant overhead to your binary. ' 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') - Empty copyWith(void Function(Empty) updates) => super.copyWith( - (message) => updates(message as Empty)); // ignore: deprecated_member_use + Empty copyWith(void Function(Empty) updates) => + super.copyWith((message) => updates(message as Empty)) + as Empty; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Empty create() => Empty._(); @@ -46,5 +47,5 @@ class Empty extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static Empty getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Empty _defaultInstance; + static Empty? _defaultInstance; } diff --git a/example/googleapis/lib/src/generated/google/protobuf/empty.pbenum.dart b/example/googleapis/lib/src/generated/google/protobuf/empty.pbenum.dart index 9246867a..73caaaf4 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/empty.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/empty.pbenum.dart @@ -2,5 +2,5 @@ // Generated code. Do not modify. // source: google/protobuf/empty.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields diff --git a/example/googleapis/lib/src/generated/google/protobuf/empty.pbjson.dart b/example/googleapis/lib/src/generated/google/protobuf/empty.pbjson.dart index 3d558d35..001c2489 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/empty.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/empty.pbjson.dart @@ -2,9 +2,18 @@ // Generated code. Do not modify. // source: google/protobuf/empty.proto // -// @dart = 2.7 -// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package +import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; + +@$core.Deprecated('Use emptyDescriptor instead') const Empty$json = const { '1': 'Empty', }; + +/// Descriptor for `Empty`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List emptyDescriptor = + $convert.base64Decode('CgVFbXB0eQ=='); diff --git a/example/googleapis/lib/src/generated/google/protobuf/struct.pb.dart b/example/googleapis/lib/src/generated/google/protobuf/struct.pb.dart index 6db1f793..03ab3797 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/struct.pb.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/struct.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/protobuf/struct.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:core' as $core; @@ -41,7 +41,7 @@ class Struct extends $pb.GeneratedMessage with $mixin.StructMixin { Struct._() : super(); factory Struct({ - $core.Map<$core.String, Value> fields, + $core.Map<$core.String, Value>? fields, }) { final _result = create(); if (fields != null) { @@ -62,8 +62,9 @@ class Struct extends $pb.GeneratedMessage with $mixin.StructMixin { @$core.Deprecated('Using this can add significant overhead to your binary. ' 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') - Struct copyWith(void Function(Struct) updates) => super.copyWith( - (message) => updates(message as Struct)); // ignore: deprecated_member_use + Struct copyWith(void Function(Struct) updates) => + super.copyWith((message) => updates(message as Struct)) + as Struct; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Struct create() => Struct._(); @@ -72,7 +73,7 @@ class Struct extends $pb.GeneratedMessage with $mixin.StructMixin { @$core.pragma('dart2js:noInline') static Struct getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Struct _defaultInstance; + static Struct? _defaultInstance; @$pb.TagNumber(1) $core.Map<$core.String, Value> get fields => $_getMap(0); @@ -151,12 +152,12 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin { Value._() : super(); factory Value({ - NullValue nullValue, - $core.double numberValue, - $core.String stringValue, - $core.bool boolValue, - Struct structValue, - ListValue listValue, + NullValue? nullValue, + $core.double? numberValue, + $core.String? stringValue, + $core.bool? boolValue, + Struct? structValue, + ListValue? listValue, }) { final _result = create(); if (nullValue != null) { @@ -192,8 +193,9 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin { @$core.Deprecated('Using this can add significant overhead to your binary. ' 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') - Value copyWith(void Function(Value) updates) => super.copyWith( - (message) => updates(message as Value)); // ignore: deprecated_member_use + Value copyWith(void Function(Value) updates) => + super.copyWith((message) => updates(message as Value)) + as Value; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Value create() => Value._(); @@ -202,9 +204,9 @@ class Value extends $pb.GeneratedMessage with $mixin.ValueMixin { @$core.pragma('dart2js:noInline') static Value getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Value _defaultInstance; + static Value? _defaultInstance; - Value_Kind whichKind() => _Value_KindByTag[$_whichOneof(0)]; + Value_Kind whichKind() => _Value_KindByTag[$_whichOneof(0)]!; void clearKind() => clearField($_whichOneof(0)); @$pb.TagNumber(1) @@ -307,7 +309,7 @@ class ListValue extends $pb.GeneratedMessage with $mixin.ListValueMixin { ListValue._() : super(); factory ListValue({ - $core.Iterable values, + $core.Iterable? values, }) { final _result = create(); if (values != null) { @@ -329,8 +331,8 @@ class ListValue extends $pb.GeneratedMessage with $mixin.ListValueMixin { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') ListValue copyWith(void Function(ListValue) updates) => - super.copyWith((message) => - updates(message as ListValue)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as ListValue)) + as ListValue; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static ListValue create() => ListValue._(); @@ -339,7 +341,7 @@ class ListValue extends $pb.GeneratedMessage with $mixin.ListValueMixin { @$core.pragma('dart2js:noInline') static ListValue getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static ListValue _defaultInstance; + static ListValue? _defaultInstance; @$pb.TagNumber(1) $core.List get values => $_getList(0); diff --git a/example/googleapis/lib/src/generated/google/protobuf/struct.pbenum.dart b/example/googleapis/lib/src/generated/google/protobuf/struct.pbenum.dart index b28644c9..10e8a6a0 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/struct.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/struct.pbenum.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/protobuf/struct.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields // ignore_for_file: UNDEFINED_SHOWN_NAME @@ -22,7 +22,7 @@ class NullValue extends $pb.ProtobufEnum { static final $core.Map<$core.int, NullValue> _byValue = $pb.ProtobufEnum.initByValue(values); - static NullValue valueOf($core.int value) => _byValue[value]; + static NullValue? valueOf($core.int value) => _byValue[value]; const NullValue._($core.int v, $core.String n) : super(v, n); } diff --git a/example/googleapis/lib/src/generated/google/protobuf/struct.pbjson.dart b/example/googleapis/lib/src/generated/google/protobuf/struct.pbjson.dart index 29be5697..19026930 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/struct.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/struct.pbjson.dart @@ -2,9 +2,14 @@ // Generated code. Do not modify. // source: google/protobuf/struct.proto // -// @dart = 2.7 -// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package +import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; + +@$core.Deprecated('Use nullValueDescriptor instead') const NullValue$json = const { '1': 'NullValue', '2': const [ @@ -12,6 +17,10 @@ const NullValue$json = const { ], }; +/// Descriptor for `NullValue`. Decode as a `google.protobuf.EnumDescriptorProto`. +final $typed_data.Uint8List nullValueDescriptor = + $convert.base64Decode('CglOdWxsVmFsdWUSDgoKTlVMTF9WQUxVRRAA'); +@$core.Deprecated('Use structDescriptor instead') const Struct$json = const { '1': 'Struct', '2': const [ @@ -27,6 +36,7 @@ const Struct$json = const { '3': const [Struct_FieldsEntry$json], }; +@$core.Deprecated('Use structDescriptor instead') const Struct_FieldsEntry$json = const { '1': 'FieldsEntry', '2': const [ @@ -43,6 +53,10 @@ const Struct_FieldsEntry$json = const { '7': const {'7': true}, }; +/// Descriptor for `Struct`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List structDescriptor = $convert.base64Decode( + 'CgZTdHJ1Y3QSOwoGZmllbGRzGAEgAygLMiMuZ29vZ2xlLnByb3RvYnVmLlN0cnVjdC5GaWVsZHNFbnRyeVIGZmllbGRzGlEKC0ZpZWxkc0VudHJ5EhAKA2tleRgBIAEoCVIDa2V5EiwKBXZhbHVlGAIgASgLMhYuZ29vZ2xlLnByb3RvYnVmLlZhbHVlUgV2YWx1ZToCOAE='); +@$core.Deprecated('Use valueDescriptor instead') const Value$json = const { '1': 'Value', '2': const [ @@ -103,6 +117,10 @@ const Value$json = const { ], }; +/// Descriptor for `Value`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List valueDescriptor = $convert.base64Decode( + 'CgVWYWx1ZRI7CgpudWxsX3ZhbHVlGAEgASgOMhouZ29vZ2xlLnByb3RvYnVmLk51bGxWYWx1ZUgAUgludWxsVmFsdWUSIwoMbnVtYmVyX3ZhbHVlGAIgASgBSABSC251bWJlclZhbHVlEiMKDHN0cmluZ192YWx1ZRgDIAEoCUgAUgtzdHJpbmdWYWx1ZRIfCgpib29sX3ZhbHVlGAQgASgISABSCWJvb2xWYWx1ZRI8CgxzdHJ1Y3RfdmFsdWUYBSABKAsyFy5nb29nbGUucHJvdG9idWYuU3RydWN0SABSC3N0cnVjdFZhbHVlEjsKCmxpc3RfdmFsdWUYBiABKAsyGi5nb29nbGUucHJvdG9idWYuTGlzdFZhbHVlSABSCWxpc3RWYWx1ZUIGCgRraW5k'); +@$core.Deprecated('Use listValueDescriptor instead') const ListValue$json = const { '1': 'ListValue', '2': const [ @@ -116,3 +134,7 @@ const ListValue$json = const { }, ], }; + +/// Descriptor for `ListValue`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List listValueDescriptor = $convert.base64Decode( + 'CglMaXN0VmFsdWUSLgoGdmFsdWVzGAEgAygLMhYuZ29vZ2xlLnByb3RvYnVmLlZhbHVlUgZ2YWx1ZXM='); diff --git a/example/googleapis/lib/src/generated/google/protobuf/timestamp.pb.dart b/example/googleapis/lib/src/generated/google/protobuf/timestamp.pb.dart index 11fe236d..a3416608 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/timestamp.pb.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/timestamp.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/protobuf/timestamp.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:core' as $core; @@ -39,8 +39,8 @@ class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin { Timestamp._() : super(); factory Timestamp({ - $fixnum.Int64 seconds, - $core.int nanos, + $fixnum.Int64? seconds, + $core.int? nanos, }) { final _result = create(); if (seconds != null) { @@ -65,8 +65,8 @@ class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') Timestamp copyWith(void Function(Timestamp) updates) => - super.copyWith((message) => - updates(message as Timestamp)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as Timestamp)) + as Timestamp; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Timestamp create() => Timestamp._(); @@ -75,7 +75,7 @@ class Timestamp extends $pb.GeneratedMessage with $mixin.TimestampMixin { @$core.pragma('dart2js:noInline') static Timestamp getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Timestamp _defaultInstance; + static Timestamp? _defaultInstance; @$pb.TagNumber(1) $fixnum.Int64 get seconds => $_getI64(0); diff --git a/example/googleapis/lib/src/generated/google/protobuf/timestamp.pbenum.dart b/example/googleapis/lib/src/generated/google/protobuf/timestamp.pbenum.dart index 262b661a..78b6cb53 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/timestamp.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/timestamp.pbenum.dart @@ -2,5 +2,5 @@ // Generated code. Do not modify. // source: google/protobuf/timestamp.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields diff --git a/example/googleapis/lib/src/generated/google/protobuf/timestamp.pbjson.dart b/example/googleapis/lib/src/generated/google/protobuf/timestamp.pbjson.dart index 33c7a8ad..1ae3997a 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/timestamp.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/timestamp.pbjson.dart @@ -2,9 +2,14 @@ // Generated code. Do not modify. // source: google/protobuf/timestamp.proto // -// @dart = 2.7 -// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package +import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; + +@$core.Deprecated('Use timestampDescriptor instead') const Timestamp$json = const { '1': 'Timestamp', '2': const [ @@ -12,3 +17,7 @@ const Timestamp$json = const { const {'1': 'nanos', '3': 2, '4': 1, '5': 5, '10': 'nanos'}, ], }; + +/// Descriptor for `Timestamp`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List timestampDescriptor = $convert.base64Decode( + 'CglUaW1lc3RhbXASGAoHc2Vjb25kcxgBIAEoA1IHc2Vjb25kcxIUCgVuYW5vcxgCIAEoBVIFbmFub3M='); diff --git a/example/googleapis/lib/src/generated/google/rpc/status.pb.dart b/example/googleapis/lib/src/generated/google/rpc/status.pb.dart index 21441ba0..718cc9c8 100644 --- a/example/googleapis/lib/src/generated/google/rpc/status.pb.dart +++ b/example/googleapis/lib/src/generated/google/rpc/status.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: google/rpc/status.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:core' as $core; @@ -43,9 +43,9 @@ class Status extends $pb.GeneratedMessage { Status._() : super(); factory Status({ - $core.int code, - $core.String message, - $core.Iterable<$0.Any> details, + $core.int? code, + $core.String? message, + $core.Iterable<$0.Any>? details, }) { final _result = create(); if (code != null) { @@ -72,8 +72,9 @@ class Status extends $pb.GeneratedMessage { @$core.Deprecated('Using this can add significant overhead to your binary. ' 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') - Status copyWith(void Function(Status) updates) => super.copyWith( - (message) => updates(message as Status)); // ignore: deprecated_member_use + Status copyWith(void Function(Status) updates) => + super.copyWith((message) => updates(message as Status)) + as Status; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Status create() => Status._(); @@ -82,7 +83,7 @@ class Status extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static Status getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Status _defaultInstance; + static Status? _defaultInstance; @$pb.TagNumber(1) $core.int get code => $_getIZ(0); diff --git a/example/googleapis/lib/src/generated/google/rpc/status.pbenum.dart b/example/googleapis/lib/src/generated/google/rpc/status.pbenum.dart index a1f68102..290e941f 100644 --- a/example/googleapis/lib/src/generated/google/rpc/status.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/rpc/status.pbenum.dart @@ -2,5 +2,5 @@ // Generated code. Do not modify. // source: google/rpc/status.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields diff --git a/example/googleapis/lib/src/generated/google/rpc/status.pbjson.dart b/example/googleapis/lib/src/generated/google/rpc/status.pbjson.dart index 240b5141..a8037c8a 100644 --- a/example/googleapis/lib/src/generated/google/rpc/status.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/rpc/status.pbjson.dart @@ -2,9 +2,14 @@ // Generated code. Do not modify. // source: google/rpc/status.proto // -// @dart = 2.7 -// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package +import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; + +@$core.Deprecated('Use statusDescriptor instead') const Status$json = const { '1': 'Status', '2': const [ @@ -20,3 +25,7 @@ const Status$json = const { }, ], }; + +/// Descriptor for `Status`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List statusDescriptor = $convert.base64Decode( + 'CgZTdGF0dXMSEgoEY29kZRgBIAEoBVIEY29kZRIYCgdtZXNzYWdlGAIgASgJUgdtZXNzYWdlEi4KB2RldGFpbHMYAyADKAsyFC5nb29nbGUucHJvdG9idWYuQW55UgdkZXRhaWxz'); diff --git a/example/googleapis/pubspec.yaml b/example/googleapis/pubspec.yaml index 06d894c7..8c8a3caf 100644 --- a/example/googleapis/pubspec.yaml +++ b/example/googleapis/pubspec.yaml @@ -3,7 +3,7 @@ description: Dart gRPC client sample for Google APIs publish_to: none environment: - sdk: '>=2.11.99 <3.0.0' + sdk: '>=2.12.0 <3.0.0' dependencies: async: ^2.2.0 diff --git a/example/googleapis/tool/regenerate.sh b/example/googleapis/tool/regenerate.sh index 2cd3e02f..4f9b6a16 100755 --- a/example/googleapis/tool/regenerate.sh +++ b/example/googleapis/tool/regenerate.sh @@ -29,4 +29,4 @@ $PROTOC $PROTOBUF/src/google/protobuf/empty.proto $PROTOC $PROTOBUF/src/google/protobuf/struct.proto $PROTOC $PROTOBUF/src/google/protobuf/timestamp.proto -dartfmt -w lib/src/generated +dart format lib/src/generated diff --git a/example/grpc-web/README.md b/example/grpc-web/README.md index 5e8ce975..e8e53393 100644 --- a/example/grpc-web/README.md +++ b/example/grpc-web/README.md @@ -8,7 +8,7 @@ This is meant to be used with the echo example provided by the grpc-web reposito Install 'webdev', by running ```sh -$ pub global activate webdev +$ dart pub global activate webdev ``` You will need a clone of the [grpc-web](https://github.com/grpc/grpc-web) repository to run the example server. @@ -24,7 +24,7 @@ To compile and run the example, assuming you are in the root of the grpc-web folder, i.e., .../example/grpc-web/, first get the dependencies by running: ```sh -$ pub get +$ dart pub get ``` Compile and run the website with: @@ -50,7 +50,7 @@ To install protoc, see the instructions on The easiest way to get the Dart protoc plugin is by running ```sh -$ pub global activate protoc_plugin +$ dart pub global activate protoc_plugin ``` and follow the directions to add `~/.pub-cache/bin` to your PATH, if you haven't diff --git a/example/grpc-web/analysis_options.yaml b/example/grpc-web/analysis_options.yaml new file mode 100644 index 00000000..d8941fc5 --- /dev/null +++ b/example/grpc-web/analysis_options.yaml @@ -0,0 +1,5 @@ +include: ../../analysis_options.yaml + +linter: + rules: + directives_ordering: false diff --git a/example/grpc-web/lib/app.dart b/example/grpc-web/lib/app.dart index 85ef7abe..48196f9a 100644 --- a/example/grpc-web/lib/app.dart +++ b/example/grpc-web/lib/app.dart @@ -42,7 +42,7 @@ class EchoApp { void _addMessage(String message, String cssClass) { final classes = cssClass.split(' '); - querySelector('#first').after(DivElement() + querySelector('#first')!.after(DivElement() ..classes.add('row') ..append(Element.tag('h2') ..append(SpanElement() diff --git a/example/grpc-web/lib/src/generated/echo.pb.dart b/example/grpc-web/lib/src/generated/echo.pb.dart index ac7c7cef..4f2165db 100644 --- a/example/grpc-web/lib/src/generated/echo.pb.dart +++ b/example/grpc-web/lib/src/generated/echo.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: echo.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:core' as $core; @@ -28,7 +28,7 @@ class EchoRequest extends $pb.GeneratedMessage { EchoRequest._() : super(); factory EchoRequest({ - $core.String message, + $core.String? message, }) { final _result = create(); if (message != null) { @@ -50,8 +50,8 @@ class EchoRequest extends $pb.GeneratedMessage { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') EchoRequest copyWith(void Function(EchoRequest) updates) => - super.copyWith((message) => - updates(message as EchoRequest)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as EchoRequest)) + as EchoRequest; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static EchoRequest create() => EchoRequest._(); @@ -60,7 +60,7 @@ class EchoRequest extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static EchoRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static EchoRequest _defaultInstance; + static EchoRequest? _defaultInstance; @$pb.TagNumber(1) $core.String get message => $_getSZ(0); @@ -94,7 +94,7 @@ class EchoResponse extends $pb.GeneratedMessage { EchoResponse._() : super(); factory EchoResponse({ - $core.String message, + $core.String? message, }) { final _result = create(); if (message != null) { @@ -116,8 +116,8 @@ class EchoResponse extends $pb.GeneratedMessage { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') EchoResponse copyWith(void Function(EchoResponse) updates) => - super.copyWith((message) => - updates(message as EchoResponse)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as EchoResponse)) + as EchoResponse; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static EchoResponse create() => EchoResponse._(); @@ -127,7 +127,7 @@ class EchoResponse extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static EchoResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static EchoResponse _defaultInstance; + static EchoResponse? _defaultInstance; @$pb.TagNumber(1) $core.String get message => $_getSZ(0); @@ -173,9 +173,9 @@ class ServerStreamingEchoRequest extends $pb.GeneratedMessage { ServerStreamingEchoRequest._() : super(); factory ServerStreamingEchoRequest({ - $core.String message, - $core.int messageCount, - $core.int messageInterval, + $core.String? message, + $core.int? messageCount, + $core.int? messageInterval, }) { final _result = create(); if (message != null) { @@ -205,8 +205,9 @@ class ServerStreamingEchoRequest extends $pb.GeneratedMessage { 'Will be removed in next major version') ServerStreamingEchoRequest copyWith( void Function(ServerStreamingEchoRequest) updates) => - super.copyWith((message) => updates(message - as ServerStreamingEchoRequest)); // ignore: deprecated_member_use + super.copyWith( + (message) => updates(message as ServerStreamingEchoRequest)) + as ServerStreamingEchoRequest; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static ServerStreamingEchoRequest create() => ServerStreamingEchoRequest._(); @@ -216,7 +217,7 @@ class ServerStreamingEchoRequest extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static ServerStreamingEchoRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static ServerStreamingEchoRequest _defaultInstance; + static ServerStreamingEchoRequest? _defaultInstance; @$pb.TagNumber(1) $core.String get message => $_getSZ(0); @@ -274,7 +275,7 @@ class ServerStreamingEchoResponse extends $pb.GeneratedMessage { ServerStreamingEchoResponse._() : super(); factory ServerStreamingEchoResponse({ - $core.String message, + $core.String? message, }) { final _result = create(); if (message != null) { @@ -298,8 +299,9 @@ class ServerStreamingEchoResponse extends $pb.GeneratedMessage { 'Will be removed in next major version') ServerStreamingEchoResponse copyWith( void Function(ServerStreamingEchoResponse) updates) => - super.copyWith((message) => updates(message - as ServerStreamingEchoResponse)); // ignore: deprecated_member_use + super.copyWith( + (message) => updates(message as ServerStreamingEchoResponse)) + as ServerStreamingEchoResponse; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static ServerStreamingEchoResponse create() => @@ -310,7 +312,7 @@ class ServerStreamingEchoResponse extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static ServerStreamingEchoResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static ServerStreamingEchoResponse _defaultInstance; + static ServerStreamingEchoResponse? _defaultInstance; @$pb.TagNumber(1) $core.String get message => $_getSZ(0); diff --git a/example/grpc-web/lib/src/generated/echo.pbenum.dart b/example/grpc-web/lib/src/generated/echo.pbenum.dart index a76f22d9..01eb863f 100644 --- a/example/grpc-web/lib/src/generated/echo.pbenum.dart +++ b/example/grpc-web/lib/src/generated/echo.pbenum.dart @@ -2,5 +2,5 @@ // Generated code. Do not modify. // source: echo.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields diff --git a/example/grpc-web/lib/src/generated/echo.pbgrpc.dart b/example/grpc-web/lib/src/generated/echo.pbgrpc.dart index 539c7d1a..fb02fe4f 100644 --- a/example/grpc-web/lib/src/generated/echo.pbgrpc.dart +++ b/example/grpc-web/lib/src/generated/echo.pbgrpc.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: echo.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:async' as $async; @@ -26,18 +26,18 @@ class EchoServiceClient extends $grpc.Client { $0.ServerStreamingEchoResponse.fromBuffer(value)); EchoServiceClient($grpc.ClientChannel channel, - {$grpc.CallOptions options, - $core.Iterable<$grpc.ClientInterceptor> interceptors}) + {$grpc.CallOptions? options, + $core.Iterable<$grpc.ClientInterceptor>? interceptors}) : super(channel, options: options, interceptors: interceptors); $grpc.ResponseFuture<$0.EchoResponse> echo($0.EchoRequest request, - {$grpc.CallOptions options}) { + {$grpc.CallOptions? options}) { return $createUnaryCall(_$echo, request, options: options); } $grpc.ResponseStream<$0.ServerStreamingEchoResponse> serverStreamingEcho( $0.ServerStreamingEchoRequest request, - {$grpc.CallOptions options}) { + {$grpc.CallOptions? options}) { return $createStreamingCall( _$serverStreamingEcho, $async.Stream.fromIterable([request]), options: options); diff --git a/example/grpc-web/lib/src/generated/echo.pbjson.dart b/example/grpc-web/lib/src/generated/echo.pbjson.dart index a76ee14f..67de8da9 100644 --- a/example/grpc-web/lib/src/generated/echo.pbjson.dart +++ b/example/grpc-web/lib/src/generated/echo.pbjson.dart @@ -2,9 +2,14 @@ // Generated code. Do not modify. // source: echo.proto // -// @dart = 2.7 -// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package +import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; + +@$core.Deprecated('Use echoRequestDescriptor instead') const EchoRequest$json = const { '1': 'EchoRequest', '2': const [ @@ -12,6 +17,10 @@ const EchoRequest$json = const { ], }; +/// Descriptor for `EchoRequest`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List echoRequestDescriptor = $convert + .base64Decode('CgtFY2hvUmVxdWVzdBIYCgdtZXNzYWdlGAEgASgJUgdtZXNzYWdl'); +@$core.Deprecated('Use echoResponseDescriptor instead') const EchoResponse$json = const { '1': 'EchoResponse', '2': const [ @@ -19,6 +28,10 @@ const EchoResponse$json = const { ], }; +/// Descriptor for `EchoResponse`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List echoResponseDescriptor = $convert + .base64Decode('CgxFY2hvUmVzcG9uc2USGAoHbWVzc2FnZRgBIAEoCVIHbWVzc2FnZQ=='); +@$core.Deprecated('Use serverStreamingEchoRequestDescriptor instead') const ServerStreamingEchoRequest$json = const { '1': 'ServerStreamingEchoRequest', '2': const [ @@ -34,9 +47,19 @@ const ServerStreamingEchoRequest$json = const { ], }; +/// Descriptor for `ServerStreamingEchoRequest`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List serverStreamingEchoRequestDescriptor = + $convert.base64Decode( + 'ChpTZXJ2ZXJTdHJlYW1pbmdFY2hvUmVxdWVzdBIYCgdtZXNzYWdlGAEgASgJUgdtZXNzYWdlEiMKDW1lc3NhZ2VfY291bnQYAiABKAVSDG1lc3NhZ2VDb3VudBIpChBtZXNzYWdlX2ludGVydmFsGAMgASgFUg9tZXNzYWdlSW50ZXJ2YWw='); +@$core.Deprecated('Use serverStreamingEchoResponseDescriptor instead') const ServerStreamingEchoResponse$json = const { '1': 'ServerStreamingEchoResponse', '2': const [ const {'1': 'message', '3': 1, '4': 1, '5': 9, '10': 'message'}, ], }; + +/// Descriptor for `ServerStreamingEchoResponse`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List serverStreamingEchoResponseDescriptor = + $convert.base64Decode( + 'ChtTZXJ2ZXJTdHJlYW1pbmdFY2hvUmVzcG9uc2USGAoHbWVzc2FnZRgBIAEoCVIHbWVzc2FnZQ=='); diff --git a/example/grpc-web/pubspec.yaml b/example/grpc-web/pubspec.yaml index 6e3efcdd..35d58a3c 100644 --- a/example/grpc-web/pubspec.yaml +++ b/example/grpc-web/pubspec.yaml @@ -3,7 +3,7 @@ description: Dart gRPC-Web sample client publish_to: none environment: - sdk: '>=2.11.99 <3.0.0' + sdk: '>=2.12.0 <3.0.0' dependencies: grpc: diff --git a/example/grpc-web/web/main.dart b/example/grpc-web/web/main.dart index 04d61549..24da3b6c 100644 --- a/example/grpc-web/web/main.dart +++ b/example/grpc-web/web/main.dart @@ -26,10 +26,10 @@ void main() { final button = querySelector('#send') as ButtonElement; button.onClick.listen((e) async { final msg = querySelector('#msg') as TextInputElement; - final value = msg.value.trim(); + final value = msg.value!.trim(); msg.value = ''; - if (value.isEmpty) return false; + if (value.isEmpty) return; if (value.indexOf(' ') > 0) { final countStr = value.substring(0, value.indexOf(' ')); diff --git a/example/helloworld/analysis_options.yaml b/example/helloworld/analysis_options.yaml new file mode 100644 index 00000000..d8941fc5 --- /dev/null +++ b/example/helloworld/analysis_options.yaml @@ -0,0 +1,5 @@ +include: ../../analysis_options.yaml + +linter: + rules: + directives_ordering: false diff --git a/example/helloworld/lib/src/generated/helloworld.pb.dart b/example/helloworld/lib/src/generated/helloworld.pb.dart index 8e2b370f..3b684b70 100644 --- a/example/helloworld/lib/src/generated/helloworld.pb.dart +++ b/example/helloworld/lib/src/generated/helloworld.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: helloworld.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:core' as $core; @@ -28,7 +28,7 @@ class HelloRequest extends $pb.GeneratedMessage { HelloRequest._() : super(); factory HelloRequest({ - $core.String name, + $core.String? name, }) { final _result = create(); if (name != null) { @@ -50,8 +50,8 @@ class HelloRequest extends $pb.GeneratedMessage { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') HelloRequest copyWith(void Function(HelloRequest) updates) => - super.copyWith((message) => - updates(message as HelloRequest)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as HelloRequest)) + as HelloRequest; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static HelloRequest create() => HelloRequest._(); @@ -61,7 +61,7 @@ class HelloRequest extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static HelloRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static HelloRequest _defaultInstance; + static HelloRequest? _defaultInstance; @$pb.TagNumber(1) $core.String get name => $_getSZ(0); @@ -95,7 +95,7 @@ class HelloReply extends $pb.GeneratedMessage { HelloReply._() : super(); factory HelloReply({ - $core.String message, + $core.String? message, }) { final _result = create(); if (message != null) { @@ -117,8 +117,8 @@ class HelloReply extends $pb.GeneratedMessage { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') HelloReply copyWith(void Function(HelloReply) updates) => - super.copyWith((message) => - updates(message as HelloReply)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as HelloReply)) + as HelloReply; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static HelloReply create() => HelloReply._(); @@ -127,7 +127,7 @@ class HelloReply extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static HelloReply getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static HelloReply _defaultInstance; + static HelloReply? _defaultInstance; @$pb.TagNumber(1) $core.String get message => $_getSZ(0); diff --git a/example/helloworld/lib/src/generated/helloworld.pbenum.dart b/example/helloworld/lib/src/generated/helloworld.pbenum.dart index 8465a3e3..c11fcf0a 100644 --- a/example/helloworld/lib/src/generated/helloworld.pbenum.dart +++ b/example/helloworld/lib/src/generated/helloworld.pbenum.dart @@ -2,5 +2,5 @@ // Generated code. Do not modify. // source: helloworld.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields diff --git a/example/helloworld/lib/src/generated/helloworld.pbgrpc.dart b/example/helloworld/lib/src/generated/helloworld.pbgrpc.dart index 81fb11ef..fa4f2ff7 100644 --- a/example/helloworld/lib/src/generated/helloworld.pbgrpc.dart +++ b/example/helloworld/lib/src/generated/helloworld.pbgrpc.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: helloworld.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:async' as $async; @@ -20,12 +20,12 @@ class GreeterClient extends $grpc.Client { ($core.List<$core.int> value) => $0.HelloReply.fromBuffer(value)); GreeterClient($grpc.ClientChannel channel, - {$grpc.CallOptions options, - $core.Iterable<$grpc.ClientInterceptor> interceptors}) + {$grpc.CallOptions? options, + $core.Iterable<$grpc.ClientInterceptor>? interceptors}) : super(channel, options: options, interceptors: interceptors); $grpc.ResponseFuture<$0.HelloReply> sayHello($0.HelloRequest request, - {$grpc.CallOptions options}) { + {$grpc.CallOptions? options}) { return $createUnaryCall(_$sayHello, request, options: options); } } diff --git a/example/helloworld/lib/src/generated/helloworld.pbjson.dart b/example/helloworld/lib/src/generated/helloworld.pbjson.dart index 3aced272..8eafa21d 100644 --- a/example/helloworld/lib/src/generated/helloworld.pbjson.dart +++ b/example/helloworld/lib/src/generated/helloworld.pbjson.dart @@ -2,9 +2,14 @@ // Generated code. Do not modify. // source: helloworld.proto // -// @dart = 2.7 -// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package +import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; + +@$core.Deprecated('Use helloRequestDescriptor instead') const HelloRequest$json = const { '1': 'HelloRequest', '2': const [ @@ -12,9 +17,17 @@ const HelloRequest$json = const { ], }; +/// Descriptor for `HelloRequest`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List helloRequestDescriptor = + $convert.base64Decode('CgxIZWxsb1JlcXVlc3QSEgoEbmFtZRgBIAEoCVIEbmFtZQ=='); +@$core.Deprecated('Use helloReplyDescriptor instead') const HelloReply$json = const { '1': 'HelloReply', '2': const [ const {'1': 'message', '3': 1, '4': 1, '5': 9, '10': 'message'}, ], }; + +/// Descriptor for `HelloReply`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List helloReplyDescriptor = $convert + .base64Decode('CgpIZWxsb1JlcGx5EhgKB21lc3NhZ2UYASABKAlSB21lc3NhZ2U='); diff --git a/example/helloworld/pubspec.yaml b/example/helloworld/pubspec.yaml index 3df07196..7eb3e18d 100644 --- a/example/helloworld/pubspec.yaml +++ b/example/helloworld/pubspec.yaml @@ -3,7 +3,7 @@ description: Dart gRPC sample client and server. publish_to: none environment: - sdk: '>=2.11.99 <3.0.0' + sdk: '>=2.12.0 <3.0.0' dependencies: async: ^2.2.0 diff --git a/example/metadata/README.md b/example/metadata/README.md index 01f1e4a1..d8f30bae 100644 --- a/example/metadata/README.md +++ b/example/metadata/README.md @@ -9,7 +9,7 @@ To compile and run the example, assuming you are in the root of the metadata folder, i.e., .../example/metadata/, first get the dependencies by running: ```sh -$ pub get +$ dart pub get ``` Then, to run the server: @@ -40,7 +40,7 @@ To install protoc with Dart support, take these steps: 1. Get the Dart protoc plugin by running ```sh - $ pub global activate protoc_plugin + $ dart pub global activate protoc_plugin ``` 1. Add `~/.pub-cache/bin` to your PATH, if you haven't diff --git a/example/metadata/analysis_options.yaml b/example/metadata/analysis_options.yaml new file mode 100644 index 00000000..d8941fc5 --- /dev/null +++ b/example/metadata/analysis_options.yaml @@ -0,0 +1,5 @@ +include: ../../analysis_options.yaml + +linter: + rules: + directives_ordering: false diff --git a/example/metadata/lib/src/client.dart b/example/metadata/lib/src/client.dart index 6644304f..488a2cd8 100644 --- a/example/metadata/lib/src/client.dart +++ b/example/metadata/lib/src/client.dart @@ -20,8 +20,8 @@ import 'package:grpc/grpc.dart'; import 'generated/metadata.pbgrpc.dart'; class Client { - ClientChannel channel; - MetadataClient stub; + late ClientChannel channel; + late MetadataClient stub; Future main(List args) async { channel = ClientChannel('127.0.0.1', diff --git a/example/metadata/lib/src/generated/metadata.pb.dart b/example/metadata/lib/src/generated/metadata.pb.dart index daffff12..65f557ee 100644 --- a/example/metadata/lib/src/generated/metadata.pb.dart +++ b/example/metadata/lib/src/generated/metadata.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: metadata.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:core' as $core; @@ -28,7 +28,7 @@ class Record extends $pb.GeneratedMessage { Record._() : super(); factory Record({ - $core.String value, + $core.String? value, }) { final _result = create(); if (value != null) { @@ -49,8 +49,9 @@ class Record extends $pb.GeneratedMessage { @$core.Deprecated('Using this can add significant overhead to your binary. ' 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') - Record copyWith(void Function(Record) updates) => super.copyWith( - (message) => updates(message as Record)); // ignore: deprecated_member_use + Record copyWith(void Function(Record) updates) => + super.copyWith((message) => updates(message as Record)) + as Record; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Record create() => Record._(); @@ -59,7 +60,7 @@ class Record extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static Record getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Record _defaultInstance; + static Record? _defaultInstance; @$pb.TagNumber(1) $core.String get value => $_getSZ(0); @@ -94,7 +95,7 @@ class Number extends $pb.GeneratedMessage { Number._() : super(); factory Number({ - $core.int value, + $core.int? value, }) { final _result = create(); if (value != null) { @@ -115,8 +116,9 @@ class Number extends $pb.GeneratedMessage { @$core.Deprecated('Using this can add significant overhead to your binary. ' 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') - Number copyWith(void Function(Number) updates) => super.copyWith( - (message) => updates(message as Number)); // ignore: deprecated_member_use + Number copyWith(void Function(Number) updates) => + super.copyWith((message) => updates(message as Number)) + as Number; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Number create() => Number._(); @@ -125,7 +127,7 @@ class Number extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static Number getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Number _defaultInstance; + static Number? _defaultInstance; @$pb.TagNumber(1) $core.int get value => $_getIZ(0); @@ -167,8 +169,9 @@ class Empty extends $pb.GeneratedMessage { @$core.Deprecated('Using this can add significant overhead to your binary. ' 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') - Empty copyWith(void Function(Empty) updates) => super.copyWith( - (message) => updates(message as Empty)); // ignore: deprecated_member_use + Empty copyWith(void Function(Empty) updates) => + super.copyWith((message) => updates(message as Empty)) + as Empty; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Empty create() => Empty._(); @@ -177,5 +180,5 @@ class Empty extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static Empty getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Empty _defaultInstance; + static Empty? _defaultInstance; } diff --git a/example/metadata/lib/src/generated/metadata.pbenum.dart b/example/metadata/lib/src/generated/metadata.pbenum.dart new file mode 100644 index 00000000..19d7663d --- /dev/null +++ b/example/metadata/lib/src/generated/metadata.pbenum.dart @@ -0,0 +1,6 @@ +/// +// Generated code. Do not modify. +// source: metadata.proto +// +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields diff --git a/example/metadata/lib/src/generated/metadata.pbgrpc.dart b/example/metadata/lib/src/generated/metadata.pbgrpc.dart index cf13cc00..ee26c3e3 100644 --- a/example/metadata/lib/src/generated/metadata.pbgrpc.dart +++ b/example/metadata/lib/src/generated/metadata.pbgrpc.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: metadata.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:async' as $async; @@ -28,22 +28,22 @@ class MetadataClient extends $grpc.Client { ($core.List<$core.int> value) => $0.Number.fromBuffer(value)); MetadataClient($grpc.ClientChannel channel, - {$grpc.CallOptions options, - $core.Iterable<$grpc.ClientInterceptor> interceptors}) + {$grpc.CallOptions? options, + $core.Iterable<$grpc.ClientInterceptor>? interceptors}) : super(channel, options: options, interceptors: interceptors); $grpc.ResponseFuture<$0.Record> echo($0.Record request, - {$grpc.CallOptions options}) { + {$grpc.CallOptions? options}) { return $createUnaryCall(_$echo, request, options: options); } $grpc.ResponseStream<$0.Number> addOne($async.Stream<$0.Number> request, - {$grpc.CallOptions options}) { + {$grpc.CallOptions? options}) { return $createStreamingCall(_$addOne, request, options: options); } $grpc.ResponseStream<$0.Number> fibonacci($0.Empty request, - {$grpc.CallOptions options}) { + {$grpc.CallOptions? options}) { return $createStreamingCall( _$fibonacci, $async.Stream.fromIterable([request]), options: options); diff --git a/example/metadata/lib/src/generated/metadata.pbjson.dart b/example/metadata/lib/src/generated/metadata.pbjson.dart new file mode 100644 index 00000000..ff8a981d --- /dev/null +++ b/example/metadata/lib/src/generated/metadata.pbjson.dart @@ -0,0 +1,41 @@ +/// +// Generated code. Do not modify. +// source: metadata.proto +// +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package + +import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; + +@$core.Deprecated('Use recordDescriptor instead') +const Record$json = const { + '1': 'Record', + '2': const [ + const {'1': 'value', '3': 1, '4': 1, '5': 9, '10': 'value'}, + ], +}; + +/// Descriptor for `Record`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List recordDescriptor = + $convert.base64Decode('CgZSZWNvcmQSFAoFdmFsdWUYASABKAlSBXZhbHVl'); +@$core.Deprecated('Use numberDescriptor instead') +const Number$json = const { + '1': 'Number', + '2': const [ + const {'1': 'value', '3': 1, '4': 1, '5': 5, '10': 'value'}, + ], +}; + +/// Descriptor for `Number`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List numberDescriptor = + $convert.base64Decode('CgZOdW1iZXISFAoFdmFsdWUYASABKAVSBXZhbHVl'); +@$core.Deprecated('Use emptyDescriptor instead') +const Empty$json = const { + '1': 'Empty', +}; + +/// Descriptor for `Empty`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List emptyDescriptor = + $convert.base64Decode('CgVFbXB0eQ=='); diff --git a/example/metadata/lib/src/server.dart b/example/metadata/lib/src/server.dart index 1f494242..17225b7b 100644 --- a/example/metadata/lib/src/server.dart +++ b/example/metadata/lib/src/server.dart @@ -24,13 +24,13 @@ class MetadataService extends MetadataServiceBase { @override Future echo(grpc.ServiceCall call, Record request) async { - final peer = call.clientMetadata['peer']; + final peer = call.clientMetadata!['peer']!; final count = callCount++; print('Echo: Call #$count: Peer: $peer, request: ${request.value}'); - call.headers['count'] = '${count}'; - call.trailers['hello'] = request.value; + call.headers!['count'] = '${count}'; + call.trailers!['hello'] = request.value; - final delay = call.clientMetadata['delay']; + final delay = call.clientMetadata!['delay']; if (delay != null) { await Future.delayed(Duration(seconds: int.parse(delay))); } diff --git a/example/metadata/pubspec.yaml b/example/metadata/pubspec.yaml index 6e84551c..7665a472 100644 --- a/example/metadata/pubspec.yaml +++ b/example/metadata/pubspec.yaml @@ -3,7 +3,7 @@ description: Dart gRPC sample client and server. publish_to: none environment: - sdk: '>=2.11.99 <3.0.0' + sdk: '>=2.12.0 <3.0.0' dependencies: async: ^2.2.0 diff --git a/example/route_guide/analysis_options.yaml b/example/route_guide/analysis_options.yaml new file mode 100644 index 00000000..d8941fc5 --- /dev/null +++ b/example/route_guide/analysis_options.yaml @@ -0,0 +1,5 @@ +include: ../../analysis_options.yaml + +linter: + rules: + directives_ordering: false diff --git a/example/route_guide/lib/src/client.dart b/example/route_guide/lib/src/client.dart index 875247c0..420cc796 100644 --- a/example/route_guide/lib/src/client.dart +++ b/example/route_guide/lib/src/client.dart @@ -21,7 +21,7 @@ import 'common.dart'; import 'generated/route_guide.pbgrpc.dart'; class Client { - RouteGuideClient stub; + late RouteGuideClient stub; Future main(List args) async { final channel = ClientChannel('127.0.0.1', diff --git a/example/route_guide/lib/src/generated/route_guide.pb.dart b/example/route_guide/lib/src/generated/route_guide.pb.dart index b18a6634..c9d3407b 100644 --- a/example/route_guide/lib/src/generated/route_guide.pb.dart +++ b/example/route_guide/lib/src/generated/route_guide.pb.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: route_guide.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:core' as $core; @@ -35,8 +35,8 @@ class Point extends $pb.GeneratedMessage { Point._() : super(); factory Point({ - $core.int latitude, - $core.int longitude, + $core.int? latitude, + $core.int? longitude, }) { final _result = create(); if (latitude != null) { @@ -60,8 +60,9 @@ class Point extends $pb.GeneratedMessage { @$core.Deprecated('Using this can add significant overhead to your binary. ' 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') - Point copyWith(void Function(Point) updates) => super.copyWith( - (message) => updates(message as Point)); // ignore: deprecated_member_use + Point copyWith(void Function(Point) updates) => + super.copyWith((message) => updates(message as Point)) + as Point; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Point create() => Point._(); @@ -70,7 +71,7 @@ class Point extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static Point getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Point _defaultInstance; + static Point? _defaultInstance; @$pb.TagNumber(1) $core.int get latitude => $_getIZ(0); @@ -123,8 +124,8 @@ class Rectangle extends $pb.GeneratedMessage { Rectangle._() : super(); factory Rectangle({ - Point lo, - Point hi, + Point? lo, + Point? hi, }) { final _result = create(); if (lo != null) { @@ -149,8 +150,8 @@ class Rectangle extends $pb.GeneratedMessage { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') Rectangle copyWith(void Function(Rectangle) updates) => - super.copyWith((message) => - updates(message as Rectangle)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as Rectangle)) + as Rectangle; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Rectangle create() => Rectangle._(); @@ -159,7 +160,7 @@ class Rectangle extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static Rectangle getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Rectangle _defaultInstance; + static Rectangle? _defaultInstance; @$pb.TagNumber(1) Point get lo => $_getN(0); @@ -215,8 +216,8 @@ class Feature extends $pb.GeneratedMessage { Feature._() : super(); factory Feature({ - $core.String name, - Point location, + $core.String? name, + Point? location, }) { final _result = create(); if (name != null) { @@ -241,8 +242,8 @@ class Feature extends $pb.GeneratedMessage { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') Feature copyWith(void Function(Feature) updates) => - super.copyWith((message) => - updates(message as Feature)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as Feature)) + as Feature; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Feature create() => Feature._(); @@ -251,7 +252,7 @@ class Feature extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static Feature getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Feature _defaultInstance; + static Feature? _defaultInstance; @$pb.TagNumber(1) $core.String get name => $_getSZ(0); @@ -305,8 +306,8 @@ class RouteNote extends $pb.GeneratedMessage { RouteNote._() : super(); factory RouteNote({ - Point location, - $core.String message, + Point? location, + $core.String? message, }) { final _result = create(); if (location != null) { @@ -331,8 +332,8 @@ class RouteNote extends $pb.GeneratedMessage { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') RouteNote copyWith(void Function(RouteNote) updates) => - super.copyWith((message) => - updates(message as RouteNote)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as RouteNote)) + as RouteNote; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static RouteNote create() => RouteNote._(); @@ -341,7 +342,7 @@ class RouteNote extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static RouteNote getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static RouteNote _defaultInstance; + static RouteNote? _defaultInstance; @$pb.TagNumber(1) Point get location => $_getN(0); @@ -408,10 +409,10 @@ class RouteSummary extends $pb.GeneratedMessage { RouteSummary._() : super(); factory RouteSummary({ - $core.int pointCount, - $core.int featureCount, - $core.int distance, - $core.int elapsedTime, + $core.int? pointCount, + $core.int? featureCount, + $core.int? distance, + $core.int? elapsedTime, }) { final _result = create(); if (pointCount != null) { @@ -442,8 +443,8 @@ class RouteSummary extends $pb.GeneratedMessage { 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') RouteSummary copyWith(void Function(RouteSummary) updates) => - super.copyWith((message) => - updates(message as RouteSummary)); // ignore: deprecated_member_use + super.copyWith((message) => updates(message as RouteSummary)) + as RouteSummary; // ignore: deprecated_member_use $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static RouteSummary create() => RouteSummary._(); @@ -453,7 +454,7 @@ class RouteSummary extends $pb.GeneratedMessage { @$core.pragma('dart2js:noInline') static RouteSummary getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static RouteSummary _defaultInstance; + static RouteSummary? _defaultInstance; @$pb.TagNumber(1) $core.int get pointCount => $_getIZ(0); diff --git a/example/route_guide/lib/src/generated/route_guide.pbenum.dart b/example/route_guide/lib/src/generated/route_guide.pbenum.dart index a510b01c..31f6c4a4 100644 --- a/example/route_guide/lib/src/generated/route_guide.pbenum.dart +++ b/example/route_guide/lib/src/generated/route_guide.pbenum.dart @@ -2,5 +2,5 @@ // Generated code. Do not modify. // source: route_guide.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields diff --git a/example/route_guide/lib/src/generated/route_guide.pbgrpc.dart b/example/route_guide/lib/src/generated/route_guide.pbgrpc.dart index 5e0d2f0e..57fe24f1 100644 --- a/example/route_guide/lib/src/generated/route_guide.pbgrpc.dart +++ b/example/route_guide/lib/src/generated/route_guide.pbgrpc.dart @@ -2,7 +2,7 @@ // Generated code. Do not modify. // source: route_guide.proto // -// @dart = 2.7 +// @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields import 'dart:async' as $async; @@ -32,17 +32,17 @@ class RouteGuideClient extends $grpc.Client { ($core.List<$core.int> value) => $0.RouteNote.fromBuffer(value)); RouteGuideClient($grpc.ClientChannel channel, - {$grpc.CallOptions options, - $core.Iterable<$grpc.ClientInterceptor> interceptors}) + {$grpc.CallOptions? options, + $core.Iterable<$grpc.ClientInterceptor>? interceptors}) : super(channel, options: options, interceptors: interceptors); $grpc.ResponseFuture<$0.Feature> getFeature($0.Point request, - {$grpc.CallOptions options}) { + {$grpc.CallOptions? options}) { return $createUnaryCall(_$getFeature, request, options: options); } $grpc.ResponseStream<$0.Feature> listFeatures($0.Rectangle request, - {$grpc.CallOptions options}) { + {$grpc.CallOptions? options}) { return $createStreamingCall( _$listFeatures, $async.Stream.fromIterable([request]), options: options); @@ -50,14 +50,14 @@ class RouteGuideClient extends $grpc.Client { $grpc.ResponseFuture<$0.RouteSummary> recordRoute( $async.Stream<$0.Point> request, - {$grpc.CallOptions options}) { + {$grpc.CallOptions? options}) { return $createStreamingCall(_$recordRoute, request, options: options) .single; } $grpc.ResponseStream<$0.RouteNote> routeChat( $async.Stream<$0.RouteNote> request, - {$grpc.CallOptions options}) { + {$grpc.CallOptions? options}) { return $createStreamingCall(_$routeChat, request, options: options); } } diff --git a/example/route_guide/lib/src/generated/route_guide.pbjson.dart b/example/route_guide/lib/src/generated/route_guide.pbjson.dart index 687d9a66..c277848b 100644 --- a/example/route_guide/lib/src/generated/route_guide.pbjson.dart +++ b/example/route_guide/lib/src/generated/route_guide.pbjson.dart @@ -2,9 +2,14 @@ // Generated code. Do not modify. // source: route_guide.proto // -// @dart = 2.7 -// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields +// @dart = 2.12 +// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package +import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; + +@$core.Deprecated('Use pointDescriptor instead') const Point$json = const { '1': 'Point', '2': const [ @@ -13,6 +18,10 @@ const Point$json = const { ], }; +/// Descriptor for `Point`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List pointDescriptor = $convert.base64Decode( + 'CgVQb2ludBIaCghsYXRpdHVkZRgBIAEoBVIIbGF0aXR1ZGUSHAoJbG9uZ2l0dWRlGAIgASgFUglsb25naXR1ZGU='); +@$core.Deprecated('Use rectangleDescriptor instead') const Rectangle$json = const { '1': 'Rectangle', '2': const [ @@ -35,6 +44,10 @@ const Rectangle$json = const { ], }; +/// Descriptor for `Rectangle`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List rectangleDescriptor = $convert.base64Decode( + 'CglSZWN0YW5nbGUSIQoCbG8YASABKAsyES5yb3V0ZWd1aWRlLlBvaW50UgJsbxIhCgJoaRgCIAEoCzIRLnJvdXRlZ3VpZGUuUG9pbnRSAmhp'); +@$core.Deprecated('Use featureDescriptor instead') const Feature$json = const { '1': 'Feature', '2': const [ @@ -50,6 +63,10 @@ const Feature$json = const { ], }; +/// Descriptor for `Feature`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List featureDescriptor = $convert.base64Decode( + 'CgdGZWF0dXJlEhIKBG5hbWUYASABKAlSBG5hbWUSLQoIbG9jYXRpb24YAiABKAsyES5yb3V0ZWd1aWRlLlBvaW50Ughsb2NhdGlvbg=='); +@$core.Deprecated('Use routeNoteDescriptor instead') const RouteNote$json = const { '1': 'RouteNote', '2': const [ @@ -65,6 +82,10 @@ const RouteNote$json = const { ], }; +/// Descriptor for `RouteNote`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List routeNoteDescriptor = $convert.base64Decode( + 'CglSb3V0ZU5vdGUSLQoIbG9jYXRpb24YASABKAsyES5yb3V0ZWd1aWRlLlBvaW50Ughsb2NhdGlvbhIYCgdtZXNzYWdlGAIgASgJUgdtZXNzYWdl'); +@$core.Deprecated('Use routeSummaryDescriptor instead') const RouteSummary$json = const { '1': 'RouteSummary', '2': const [ @@ -74,3 +95,7 @@ const RouteSummary$json = const { const {'1': 'elapsed_time', '3': 4, '4': 1, '5': 5, '10': 'elapsedTime'}, ], }; + +/// Descriptor for `RouteSummary`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List routeSummaryDescriptor = $convert.base64Decode( + 'CgxSb3V0ZVN1bW1hcnkSHwoLcG9pbnRfY291bnQYASABKAVSCnBvaW50Q291bnQSIwoNZmVhdHVyZV9jb3VudBgCIAEoBVIMZmVhdHVyZUNvdW50EhoKCGRpc3RhbmNlGAMgASgFUghkaXN0YW5jZRIhCgxlbGFwc2VkX3RpbWUYBCABKAVSC2VsYXBzZWRUaW1l'); diff --git a/example/route_guide/lib/src/server.dart b/example/route_guide/lib/src/server.dart index 8f02a790..23484644 100644 --- a/example/route_guide/lib/src/server.dart +++ b/example/route_guide/lib/src/server.dart @@ -15,6 +15,7 @@ import 'dart:math' show atan2, cos, max, min, pi, sin, sqrt; +import 'package:collection/collection.dart' show IterableExtension; import 'package:grpc/grpc.dart' as grpc; import 'common.dart'; @@ -77,14 +78,14 @@ class RouteGuideService extends RouteGuideServiceBase { var pointCount = 0; var featureCount = 0; var distance = 0.0; - Point previous; + Point? previous; final timer = Stopwatch(); await for (var location in request) { if (!timer.isRunning) timer.start(); pointCount++; - final feature = featuresDb.firstWhere((f) => f.location == location, - orElse: () => null); + final feature = + featuresDb.firstWhereOrNull((f) => f.location == location); if (feature != null) { featureCount++; } diff --git a/example/route_guide/pubspec.yaml b/example/route_guide/pubspec.yaml index 2c6e72cf..d74f74f0 100644 --- a/example/route_guide/pubspec.yaml +++ b/example/route_guide/pubspec.yaml @@ -3,10 +3,11 @@ description: Dart gRPC sample client and server. publish_to: none environment: - sdk: '>=2.11.99 <3.0.0' + sdk: '>=2.12.0 <3.0.0' dependencies: async: ^2.2.0 grpc: path: ../../ protobuf: ^2.0.0 + collection: ^1.15.0-nullsafety.4