diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..d5262beb --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# Set update schedule for GitHub Actions +# See https://docs.github.com/en/free-pro-team@latest/github/administering-a-repository/keeping-your-actions-up-to-date-with-dependabot + +version: 2 +updates: + +- package-ecosystem: "github-actions" + directory: "/" + schedule: + # Check for updates to GitHub Actions every weekday + interval: "monthly" diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 11b45d54..23847d4b 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -16,10 +16,10 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - sdk: [dev, 2.12.0] + sdk: [dev, 2.17.0] steps: - - uses: actions/checkout@v2 - - uses: dart-lang/setup-dart@v1.2 + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 + - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d with: sdk: ${{ matrix.sdk }} - name: Report version @@ -60,7 +60,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - sdk: [dev, 2.12.0] + sdk: [dev, 2.17.0] platform: [vm, chrome] exclude: # We only run Chrome tests on Linux. No need to run them @@ -70,8 +70,8 @@ jobs: - os: macos-latest platform: chrome steps: - - uses: actions/checkout@v2 - - uses: dart-lang/setup-dart@v1.2 + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 + - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d with: sdk: ${{ matrix.sdk }} - name: Report version diff --git a/CHANGELOG.md b/CHANGELOG.md index 803fba51..9338303a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.1.1-dev + +* Require Dart 2.17 or greater. + ## 3.1.0 * Expose a stream for connection state changes on ClientChannel to address diff --git a/analysis_options.yaml b/analysis_options.yaml index 6ffed439..ddb7c9b0 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,56 +1,20 @@ -# Lint rules and documentation, see http://dart-lang.github.io/linter/lints +# https://dart.dev/guides/language/analysis-options +include: package:lints/recommended.yaml + +analyzer: + errors: + # These should be fixed or ignored in the proto generator + implementation_imports: ignore + no_leading_underscores_for_local_identifiers: ignore linter: rules: - always_declare_return_types - - always_require_non_null_named_parameters - - annotate_overrides - - avoid_empty_else - - avoid_init_to_null - - avoid_null_checks_in_equality_operators - - avoid_relative_lib_imports - - avoid_return_types_on_setters - - avoid_shadowing_type_parameters - - avoid_types_as_parameter_names - - camel_case_extensions - cancel_subscriptions - close_sinks - - curly_braces_in_flow_control_structures - directives_ordering - - empty_catches - - empty_constructor_bodies - - hash_and_equals - - iterable_contains_unrelated_type - - library_names - - library_prefixes - - list_remove_unrelated_type - - no_duplicate_case_values - - null_closures - omit_local_variable_types - - prefer_adjacent_string_concatenation - - prefer_collection_literals - - prefer_conditional_assignment - - prefer_contains - - prefer_equal_for_default_values - - prefer_final_fields - prefer_final_locals - - prefer_for_elements_to_map_fromIterable - - prefer_generic_function_type_aliases - - prefer_if_null_operators - - prefer_is_empty - - prefer_is_not_empty - - prefer_iterable_whereType - prefer_single_quotes - - prefer_spread_collections - - recursive_getters - - slash_for_doc_comments - test_types_in_equals - - type_init_formals - - unnecessary_const - - unnecessary_new - - unnecessary_null_in_if_null_operators - - unnecessary_this - - unrelated_type_equality_checks - - use_function_type_syntax_for_parameters - - use_rethrow_when_possible - - valid_regexps + - use_super_parameters 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 1d1ad20d..13c1f8de 100644 --- a/example/googleapis/lib/src/generated/google/api/label.pb.dart +++ b/example/googleapis/lib/src/generated/google/api/label.pb.dart @@ -3,7 +3,7 @@ // source: google/api/label.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; 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 df529508..706975bc 100644 --- a/example/googleapis/lib/src/generated/google/api/label.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/api/label.pbenum.dart @@ -3,7 +3,7 @@ // source: google/api/label.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name // ignore_for_file: UNDEFINED_SHOWN_NAME import 'dart:core' as $core; 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 ce5bf69f..4adddaa5 100644 --- a/example/googleapis/lib/src/generated/google/api/label.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/api/label.pbjson.dart @@ -3,7 +3,7 @@ // source: google/api/label.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; import 'dart:convert' as $convert; 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 9b8b442d..24f7f2a9 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 @@ -3,7 +3,7 @@ // source: google/api/launch_stage.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name 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 9f1269f6..230876a0 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 @@ -3,7 +3,7 @@ // source: google/api/launch_stage.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name // ignore_for_file: UNDEFINED_SHOWN_NAME import 'dart:core' as $core; 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 c2f60ce2..4c273c33 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 @@ -3,7 +3,7 @@ // source: google/api/launch_stage.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; import 'dart:convert' as $convert; 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 fce05f47..901acb67 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 @@ -3,7 +3,7 @@ // source: google/api/monitored_resource.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; 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 d504b540..9b696355 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 @@ -3,4 +3,4 @@ // source: google/api/monitored_resource.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name 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 ec99a234..7e9db211 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 @@ -3,7 +3,7 @@ // source: google/api/monitored_resource.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; import 'dart:convert' as $convert; 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 e73c6298..92d8ec06 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 @@ -3,7 +3,7 @@ // source: google/logging/type/http_request.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; 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 a77cd9e9..91e94405 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 @@ -3,4 +3,4 @@ // source: google/logging/type/http_request.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name 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 39988b43..fc1dd8e0 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 @@ -3,7 +3,7 @@ // source: google/logging/type/http_request.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; import 'dart:convert' as $convert; 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 48a8d391..7b5a9456 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 @@ -3,7 +3,7 @@ // source: google/logging/type/log_severity.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name 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 c940a793..b36fcade 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 @@ -3,7 +3,7 @@ // source: google/logging/type/log_severity.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name // ignore_for_file: UNDEFINED_SHOWN_NAME import 'dart:core' as $core; 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 9550d49c..48bcaa58 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 @@ -3,7 +3,7 @@ // source: google/logging/type/log_severity.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; import 'dart:convert' as $convert; 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 5cd92ee8..b7ce5786 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 @@ -3,7 +3,7 @@ // source: google/logging/v2/log_entry.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; @@ -133,6 +133,12 @@ class LogEntry extends $pb.GeneratedMessage { const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'traceSampled') + ..aOM( + 35, + const $core.bool.fromEnvironment('protobuf.omit_field_names') + ? '' + : 'split', + subBuilder: LogSplit.create) ..hasRequiredFields = false; LogEntry._() : super(); @@ -153,6 +159,7 @@ class LogEntry extends $pb.GeneratedMessage { $4.Timestamp? receiveTimestamp, $core.String? spanId, $core.bool? traceSampled, + LogSplit? split, }) { final _result = create(); if (protoPayload != null) { @@ -203,6 +210,9 @@ class LogEntry extends $pb.GeneratedMessage { if (traceSampled != null) { _result.traceSampled = traceSampled; } + if (split != null) { + _result.split = split; + } return _result; } factory LogEntry.fromBuffer($core.List<$core.int> i, @@ -432,6 +442,20 @@ class LogEntry extends $pb.GeneratedMessage { $core.bool hasTraceSampled() => $_has(15); @$pb.TagNumber(30) void clearTraceSampled() => clearField(30); + + @$pb.TagNumber(35) + LogSplit get split => $_getN(16); + @$pb.TagNumber(35) + set split(LogSplit v) { + setField(35, v); + } + + @$pb.TagNumber(35) + $core.bool hasSplit() => $_has(16); + @$pb.TagNumber(35) + void clearSplit() => clearField(35); + @$pb.TagNumber(35) + LogSplit ensureSplit() => $_ensure(16); } class LogEntryOperation extends $pb.GeneratedMessage { @@ -674,3 +698,113 @@ class LogEntrySourceLocation extends $pb.GeneratedMessage { @$pb.TagNumber(3) void clearFunction() => clearField(3); } + +class LogSplit extends $pb.GeneratedMessage { + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + const $core.bool.fromEnvironment('protobuf.omit_message_names') + ? '' + : 'LogSplit', + package: const $pb.PackageName( + const $core.bool.fromEnvironment('protobuf.omit_message_names') + ? '' + : 'google.logging.v2'), + createEmptyInstance: create) + ..aOS( + 1, + const $core.bool.fromEnvironment('protobuf.omit_field_names') + ? '' + : 'uid') + ..a<$core.int>( + 2, + const $core.bool.fromEnvironment('protobuf.omit_field_names') + ? '' + : 'index', + $pb.PbFieldType.O3) + ..a<$core.int>( + 3, + const $core.bool.fromEnvironment('protobuf.omit_field_names') + ? '' + : 'totalSplits', + $pb.PbFieldType.O3) + ..hasRequiredFields = false; + + LogSplit._() : super(); + factory LogSplit({ + $core.String? uid, + $core.int? index, + $core.int? totalSplits, + }) { + final _result = create(); + if (uid != null) { + _result.uid = uid; + } + if (index != null) { + _result.index = index; + } + if (totalSplits != null) { + _result.totalSplits = totalSplits; + } + return _result; + } + factory LogSplit.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory LogSplit.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + LogSplit clone() => LogSplit()..mergeFromMessage(this); + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + LogSplit copyWith(void Function(LogSplit) updates) => + super.copyWith((message) => updates(message as LogSplit)) + as LogSplit; // ignore: deprecated_member_use + $pb.BuilderInfo get info_ => _i; + @$core.pragma('dart2js:noInline') + static LogSplit create() => LogSplit._(); + LogSplit createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + @$core.pragma('dart2js:noInline') + static LogSplit getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static LogSplit? _defaultInstance; + + @$pb.TagNumber(1) + $core.String get uid => $_getSZ(0); + @$pb.TagNumber(1) + set uid($core.String v) { + $_setString(0, v); + } + + @$pb.TagNumber(1) + $core.bool hasUid() => $_has(0); + @$pb.TagNumber(1) + void clearUid() => clearField(1); + + @$pb.TagNumber(2) + $core.int get index => $_getIZ(1); + @$pb.TagNumber(2) + set index($core.int v) { + $_setSignedInt32(1, v); + } + + @$pb.TagNumber(2) + $core.bool hasIndex() => $_has(1); + @$pb.TagNumber(2) + void clearIndex() => clearField(2); + + @$pb.TagNumber(3) + $core.int get totalSplits => $_getIZ(2); + @$pb.TagNumber(3) + set totalSplits($core.int v) { + $_setSignedInt32(2, v); + } + + @$pb.TagNumber(3) + $core.bool hasTotalSplits() => $_has(2); + @$pb.TagNumber(3) + void clearTotalSplits() => clearField(3); +} 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 24e070d5..2491274a 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 @@ -3,4 +3,4 @@ // source: google/logging/v2/log_entry.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name 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 e7bda7c5..a152f834 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 @@ -3,7 +3,7 @@ // source: google/logging/v2/log_entry.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; import 'dart:convert' as $convert; @@ -144,6 +144,15 @@ const LogEntry$json = const { '8': const {}, '10': 'sourceLocation' }, + const { + '1': 'split', + '3': 35, + '4': 1, + '5': 11, + '6': '.google.logging.v2.LogSplit', + '8': const {}, + '10': 'split' + }, ], '3': const [LogEntry_LabelsEntry$json], '7': const {}, @@ -164,7 +173,7 @@ const LogEntry_LabelsEntry$json = const { /// Descriptor for `LogEntry`. Decode as a `google.protobuf.DescriptorProto`. final $typed_data.Uint8List logEntryDescriptor = $convert.base64Decode( - 'CghMb2dFbnRyeRIeCghsb2dfbmFtZRgMIAEoCUID4EECUgdsb2dOYW1lEj4KCHJlc291cmNlGAggASgLMh0uZ29vZ2xlLmFwaS5Nb25pdG9yZWRSZXNvdXJjZUID4EECUghyZXNvdXJjZRI7Cg1wcm90b19wYXlsb2FkGAIgASgLMhQuZ29vZ2xlLnByb3RvYnVmLkFueUgAUgxwcm90b1BheWxvYWQSIwoMdGV4dF9wYXlsb2FkGAMgASgJSABSC3RleHRQYXlsb2FkEjwKDGpzb25fcGF5bG9hZBgGIAEoCzIXLmdvb2dsZS5wcm90b2J1Zi5TdHJ1Y3RIAFILanNvblBheWxvYWQSPQoJdGltZXN0YW1wGAkgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEBUgl0aW1lc3RhbXASTAoRcmVjZWl2ZV90aW1lc3RhbXAYGCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQNSEHJlY2VpdmVUaW1lc3RhbXASQQoIc2V2ZXJpdHkYCiABKA4yIC5nb29nbGUubG9nZ2luZy50eXBlLkxvZ1NldmVyaXR5QgPgQQFSCHNldmVyaXR5EiAKCWluc2VydF9pZBgEIAEoCUID4EEBUghpbnNlcnRJZBJICgxodHRwX3JlcXVlc3QYByABKAsyIC5nb29nbGUubG9nZ2luZy50eXBlLkh0dHBSZXF1ZXN0QgPgQQFSC2h0dHBSZXF1ZXN0EkQKBmxhYmVscxgLIAMoCzInLmdvb2dsZS5sb2dnaW5nLnYyLkxvZ0VudHJ5LkxhYmVsc0VudHJ5QgPgQQFSBmxhYmVscxJHCglvcGVyYXRpb24YDyABKAsyJC5nb29nbGUubG9nZ2luZy52Mi5Mb2dFbnRyeU9wZXJhdGlvbkID4EEBUglvcGVyYXRpb24SGQoFdHJhY2UYFiABKAlCA+BBAVIFdHJhY2USHAoHc3Bhbl9pZBgbIAEoCUID4EEBUgZzcGFuSWQSKAoNdHJhY2Vfc2FtcGxlZBgeIAEoCEID4EEBUgx0cmFjZVNhbXBsZWQSVwoPc291cmNlX2xvY2F0aW9uGBcgASgLMikuZ29vZ2xlLmxvZ2dpbmcudjIuTG9nRW50cnlTb3VyY2VMb2NhdGlvbkID4EEBUg5zb3VyY2VMb2NhdGlvbho5CgtMYWJlbHNFbnRyeRIQCgNrZXkYASABKAlSA2tleRIUCgV2YWx1ZRgCIAEoCVIFdmFsdWU6AjgBOr0B6kG5AQoabG9nZ2luZy5nb29nbGVhcGlzLmNvbS9Mb2cSHXByb2plY3RzL3twcm9qZWN0fS9sb2dzL3tsb2d9Eidvcmdhbml6YXRpb25zL3tvcmdhbml6YXRpb259L2xvZ3Mve2xvZ30SG2ZvbGRlcnMve2ZvbGRlcn0vbG9ncy97bG9nfRIsYmlsbGluZ0FjY291bnRzL3tiaWxsaW5nX2FjY291bnR9L2xvZ3Mve2xvZ30aCGxvZ19uYW1lQgkKB3BheWxvYWQ='); + 'CghMb2dFbnRyeRIeCghsb2dfbmFtZRgMIAEoCUID4EECUgdsb2dOYW1lEj4KCHJlc291cmNlGAggASgLMh0uZ29vZ2xlLmFwaS5Nb25pdG9yZWRSZXNvdXJjZUID4EECUghyZXNvdXJjZRI7Cg1wcm90b19wYXlsb2FkGAIgASgLMhQuZ29vZ2xlLnByb3RvYnVmLkFueUgAUgxwcm90b1BheWxvYWQSIwoMdGV4dF9wYXlsb2FkGAMgASgJSABSC3RleHRQYXlsb2FkEjwKDGpzb25fcGF5bG9hZBgGIAEoCzIXLmdvb2dsZS5wcm90b2J1Zi5TdHJ1Y3RIAFILanNvblBheWxvYWQSPQoJdGltZXN0YW1wGAkgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEBUgl0aW1lc3RhbXASTAoRcmVjZWl2ZV90aW1lc3RhbXAYGCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQNSEHJlY2VpdmVUaW1lc3RhbXASQQoIc2V2ZXJpdHkYCiABKA4yIC5nb29nbGUubG9nZ2luZy50eXBlLkxvZ1NldmVyaXR5QgPgQQFSCHNldmVyaXR5EiAKCWluc2VydF9pZBgEIAEoCUID4EEBUghpbnNlcnRJZBJICgxodHRwX3JlcXVlc3QYByABKAsyIC5nb29nbGUubG9nZ2luZy50eXBlLkh0dHBSZXF1ZXN0QgPgQQFSC2h0dHBSZXF1ZXN0EkQKBmxhYmVscxgLIAMoCzInLmdvb2dsZS5sb2dnaW5nLnYyLkxvZ0VudHJ5LkxhYmVsc0VudHJ5QgPgQQFSBmxhYmVscxJHCglvcGVyYXRpb24YDyABKAsyJC5nb29nbGUubG9nZ2luZy52Mi5Mb2dFbnRyeU9wZXJhdGlvbkID4EEBUglvcGVyYXRpb24SGQoFdHJhY2UYFiABKAlCA+BBAVIFdHJhY2USHAoHc3Bhbl9pZBgbIAEoCUID4EEBUgZzcGFuSWQSKAoNdHJhY2Vfc2FtcGxlZBgeIAEoCEID4EEBUgx0cmFjZVNhbXBsZWQSVwoPc291cmNlX2xvY2F0aW9uGBcgASgLMikuZ29vZ2xlLmxvZ2dpbmcudjIuTG9nRW50cnlTb3VyY2VMb2NhdGlvbkID4EEBUg5zb3VyY2VMb2NhdGlvbhI2CgVzcGxpdBgjIAEoCzIbLmdvb2dsZS5sb2dnaW5nLnYyLkxvZ1NwbGl0QgPgQQFSBXNwbGl0GjkKC0xhYmVsc0VudHJ5EhAKA2tleRgBIAEoCVIDa2V5EhQKBXZhbHVlGAIgASgJUgV2YWx1ZToCOAE6vQHqQbkBChpsb2dnaW5nLmdvb2dsZWFwaXMuY29tL0xvZxIdcHJvamVjdHMve3Byb2plY3R9L2xvZ3Mve2xvZ30SJ29yZ2FuaXphdGlvbnMve29yZ2FuaXphdGlvbn0vbG9ncy97bG9nfRIbZm9sZGVycy97Zm9sZGVyfS9sb2dzL3tsb2d9EixiaWxsaW5nQWNjb3VudHMve2JpbGxpbmdfYWNjb3VudH0vbG9ncy97bG9nfRoIbG9nX25hbWVCCQoHcGF5bG9hZA=='); @$core.Deprecated('Use logEntryOperationDescriptor instead') const LogEntryOperation$json = const { '1': 'LogEntryOperation', @@ -207,3 +216,16 @@ const LogEntrySourceLocation$json = const { final $typed_data.Uint8List logEntrySourceLocationDescriptor = $convert.base64Decode( 'ChZMb2dFbnRyeVNvdXJjZUxvY2F0aW9uEhcKBGZpbGUYASABKAlCA+BBAVIEZmlsZRIXCgRsaW5lGAIgASgDQgPgQQFSBGxpbmUSHwoIZnVuY3Rpb24YAyABKAlCA+BBAVIIZnVuY3Rpb24='); +@$core.Deprecated('Use logSplitDescriptor instead') +const LogSplit$json = const { + '1': 'LogSplit', + '2': const [ + const {'1': 'uid', '3': 1, '4': 1, '5': 9, '10': 'uid'}, + const {'1': 'index', '3': 2, '4': 1, '5': 5, '10': 'index'}, + const {'1': 'total_splits', '3': 3, '4': 1, '5': 5, '10': 'totalSplits'}, + ], +}; + +/// Descriptor for `LogSplit`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List logSplitDescriptor = $convert.base64Decode( + 'CghMb2dTcGxpdBIQCgN1aWQYASABKAlSA3VpZBIUCgVpbmRleBgCIAEoBVIFaW5kZXgSIQoMdG90YWxfc3BsaXRzGAMgASgFUgt0b3RhbFNwbGl0cw=='); 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 d32ac617..4e8db153 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 @@ -3,16 +3,16 @@ // source: google/logging/v2/logging.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; import 'package:protobuf/protobuf.dart' as $pb; -import '../../api/monitored_resource.pb.dart' as $3; -import 'log_entry.pb.dart' as $4; -import '../../rpc/status.pb.dart' as $5; -import '../../protobuf/duration.pb.dart' as $6; +import '../../api/monitored_resource.pb.dart' as $2; +import 'log_entry.pb.dart' as $3; +import '../../rpc/status.pb.dart' as $4; +import '../../protobuf/duration.pb.dart' as $5; import 'logging.pbenum.dart'; @@ -100,12 +100,12 @@ class WriteLogEntriesRequest extends $pb.GeneratedMessage { const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'logName') - ..aOM<$3.MonitoredResource>( + ..aOM<$2.MonitoredResource>( 2, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'resource', - subBuilder: $3.MonitoredResource.create) + subBuilder: $2.MonitoredResource.create) ..m<$core.String, $core.String>( 3, const $core.bool.fromEnvironment('protobuf.omit_field_names') @@ -115,13 +115,13 @@ class WriteLogEntriesRequest extends $pb.GeneratedMessage { keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OS, packageName: const $pb.PackageName('google.logging.v2')) - ..pc<$4.LogEntry>( + ..pc<$3.LogEntry>( 4, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'entries', $pb.PbFieldType.PM, - subBuilder: $4.LogEntry.create) + subBuilder: $3.LogEntry.create) ..aOB( 5, const $core.bool.fromEnvironment('protobuf.omit_field_names') @@ -137,9 +137,9 @@ class WriteLogEntriesRequest extends $pb.GeneratedMessage { WriteLogEntriesRequest._() : super(); factory WriteLogEntriesRequest({ $core.String? logName, - $3.MonitoredResource? resource, + $2.MonitoredResource? resource, $core.Map<$core.String, $core.String>? labels, - $core.Iterable<$4.LogEntry>? entries, + $core.Iterable<$3.LogEntry>? entries, $core.bool? partialSuccess, $core.bool? dryRun, }) { @@ -206,9 +206,9 @@ class WriteLogEntriesRequest extends $pb.GeneratedMessage { void clearLogName() => clearField(1); @$pb.TagNumber(2) - $3.MonitoredResource get resource => $_getN(1); + $2.MonitoredResource get resource => $_getN(1); @$pb.TagNumber(2) - set resource($3.MonitoredResource v) { + set resource($2.MonitoredResource v) { setField(2, v); } @@ -217,13 +217,13 @@ class WriteLogEntriesRequest extends $pb.GeneratedMessage { @$pb.TagNumber(2) void clearResource() => clearField(2); @$pb.TagNumber(2) - $3.MonitoredResource ensureResource() => $_ensure(1); + $2.MonitoredResource ensureResource() => $_ensure(1); @$pb.TagNumber(3) $core.Map<$core.String, $core.String> get labels => $_getMap(2); @$pb.TagNumber(4) - $core.List<$4.LogEntry> get entries => $_getList(3); + $core.List<$3.LogEntry> get entries => $_getList(3); @$pb.TagNumber(5) $core.bool get partialSuccess => $_getBF(4); @@ -304,7 +304,7 @@ class WriteLogEntriesPartialErrors extends $pb.GeneratedMessage { ? '' : 'google.logging.v2'), createEmptyInstance: create) - ..m<$core.int, $5.Status>( + ..m<$core.int, $4.Status>( 1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' @@ -312,13 +312,13 @@ class WriteLogEntriesPartialErrors extends $pb.GeneratedMessage { entryClassName: 'WriteLogEntriesPartialErrors.LogEntryErrorsEntry', keyFieldType: $pb.PbFieldType.O3, valueFieldType: $pb.PbFieldType.OM, - valueCreator: $5.Status.create, + valueCreator: $4.Status.create, packageName: const $pb.PackageName('google.logging.v2')) ..hasRequiredFields = false; WriteLogEntriesPartialErrors._() : super(); factory WriteLogEntriesPartialErrors({ - $core.Map<$core.int, $5.Status>? logEntryErrors, + $core.Map<$core.int, $4.Status>? logEntryErrors, }) { final _result = create(); if (logEntryErrors != null) { @@ -358,7 +358,7 @@ class WriteLogEntriesPartialErrors extends $pb.GeneratedMessage { static WriteLogEntriesPartialErrors? _defaultInstance; @$pb.TagNumber(1) - $core.Map<$core.int, $5.Status> get logEntryErrors => $_getMap(0); + $core.Map<$core.int, $4.Status> get logEntryErrors => $_getMap(0); } class ListLogEntriesRequest extends $pb.GeneratedMessage { @@ -516,13 +516,13 @@ class ListLogEntriesResponse extends $pb.GeneratedMessage { ? '' : 'google.logging.v2'), createEmptyInstance: create) - ..pc<$4.LogEntry>( + ..pc<$3.LogEntry>( 1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'entries', $pb.PbFieldType.PM, - subBuilder: $4.LogEntry.create) + subBuilder: $3.LogEntry.create) ..aOS( 2, const $core.bool.fromEnvironment('protobuf.omit_field_names') @@ -532,7 +532,7 @@ class ListLogEntriesResponse extends $pb.GeneratedMessage { ListLogEntriesResponse._() : super(); factory ListLogEntriesResponse({ - $core.Iterable<$4.LogEntry>? entries, + $core.Iterable<$3.LogEntry>? entries, $core.String? nextPageToken, }) { final _result = create(); @@ -574,7 +574,7 @@ class ListLogEntriesResponse extends $pb.GeneratedMessage { static ListLogEntriesResponse? _defaultInstance; @$pb.TagNumber(1) - $core.List<$4.LogEntry> get entries => $_getList(0); + $core.List<$3.LogEntry> get entries => $_getList(0); @$pb.TagNumber(2) $core.String get nextPageToken => $_getSZ(1); @@ -694,13 +694,13 @@ class ListMonitoredResourceDescriptorsResponse extends $pb.GeneratedMessage { ? '' : 'google.logging.v2'), createEmptyInstance: create) - ..pc<$3.MonitoredResourceDescriptor>( + ..pc<$2.MonitoredResourceDescriptor>( 1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'resourceDescriptors', $pb.PbFieldType.PM, - subBuilder: $3.MonitoredResourceDescriptor.create) + subBuilder: $2.MonitoredResourceDescriptor.create) ..aOS( 2, const $core.bool.fromEnvironment('protobuf.omit_field_names') @@ -710,7 +710,7 @@ class ListMonitoredResourceDescriptorsResponse extends $pb.GeneratedMessage { ListMonitoredResourceDescriptorsResponse._() : super(); factory ListMonitoredResourceDescriptorsResponse({ - $core.Iterable<$3.MonitoredResourceDescriptor>? resourceDescriptors, + $core.Iterable<$2.MonitoredResourceDescriptor>? resourceDescriptors, $core.String? nextPageToken, }) { final _result = create(); @@ -757,7 +757,7 @@ class ListMonitoredResourceDescriptorsResponse extends $pb.GeneratedMessage { static ListMonitoredResourceDescriptorsResponse? _defaultInstance; @$pb.TagNumber(1) - $core.List<$3.MonitoredResourceDescriptor> get resourceDescriptors => + $core.List<$2.MonitoredResourceDescriptor> get resourceDescriptors => $_getList(0); @$pb.TagNumber(2) @@ -994,19 +994,19 @@ class TailLogEntriesRequest extends $pb.GeneratedMessage { const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'filter') - ..aOM<$6.Duration>( + ..aOM<$5.Duration>( 3, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'bufferWindow', - subBuilder: $6.Duration.create) + subBuilder: $5.Duration.create) ..hasRequiredFields = false; TailLogEntriesRequest._() : super(); factory TailLogEntriesRequest({ $core.Iterable<$core.String>? resourceNames, $core.String? filter, - $6.Duration? bufferWindow, + $5.Duration? bufferWindow, }) { final _result = create(); if (resourceNames != null) { @@ -1065,9 +1065,9 @@ class TailLogEntriesRequest extends $pb.GeneratedMessage { void clearFilter() => clearField(2); @$pb.TagNumber(3) - $6.Duration get bufferWindow => $_getN(2); + $5.Duration get bufferWindow => $_getN(2); @$pb.TagNumber(3) - set bufferWindow($6.Duration v) { + set bufferWindow($5.Duration v) { setField(3, v); } @@ -1076,7 +1076,7 @@ class TailLogEntriesRequest extends $pb.GeneratedMessage { @$pb.TagNumber(3) void clearBufferWindow() => clearField(3); @$pb.TagNumber(3) - $6.Duration ensureBufferWindow() => $_ensure(2); + $5.Duration ensureBufferWindow() => $_ensure(2); } class TailLogEntriesResponse_SuppressionInfo extends $pb.GeneratedMessage { @@ -1189,13 +1189,13 @@ class TailLogEntriesResponse extends $pb.GeneratedMessage { ? '' : 'google.logging.v2'), createEmptyInstance: create) - ..pc<$4.LogEntry>( + ..pc<$3.LogEntry>( 1, const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'entries', $pb.PbFieldType.PM, - subBuilder: $4.LogEntry.create) + subBuilder: $3.LogEntry.create) ..pc( 2, const $core.bool.fromEnvironment('protobuf.omit_field_names') @@ -1207,7 +1207,7 @@ class TailLogEntriesResponse extends $pb.GeneratedMessage { TailLogEntriesResponse._() : super(); factory TailLogEntriesResponse({ - $core.Iterable<$4.LogEntry>? entries, + $core.Iterable<$3.LogEntry>? entries, $core.Iterable? suppressionInfo, }) { final _result = create(); @@ -1249,7 +1249,7 @@ class TailLogEntriesResponse extends $pb.GeneratedMessage { static TailLogEntriesResponse? _defaultInstance; @$pb.TagNumber(1) - $core.List<$4.LogEntry> get entries => $_getList(0); + $core.List<$3.LogEntry> get entries => $_getList(0); @$pb.TagNumber(2) $core.List get suppressionInfo => 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 12fdd560..df9a42e9 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 @@ -3,7 +3,7 @@ // source: google/logging/v2/logging.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name // ignore_for_file: UNDEFINED_SHOWN_NAME import 'dart:core' as $core; 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 c549eb5b..0b83f728 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 @@ -3,92 +3,92 @@ // source: google/logging/v2/logging.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:async' as $async; import 'dart:core' as $core; import 'package:grpc/service_api.dart' as $grpc; -import 'logging.pb.dart' as $2; +import 'logging.pb.dart' as $0; import '../../protobuf/empty.pb.dart' as $1; export 'logging.pb.dart'; class LoggingServiceV2Client extends $grpc.Client { - static final _$deleteLog = $grpc.ClientMethod<$2.DeleteLogRequest, $1.Empty>( + static final _$deleteLog = $grpc.ClientMethod<$0.DeleteLogRequest, $1.Empty>( '/google.logging.v2.LoggingServiceV2/DeleteLog', - ($2.DeleteLogRequest value) => value.writeToBuffer(), + ($0.DeleteLogRequest value) => value.writeToBuffer(), ($core.List<$core.int> value) => $1.Empty.fromBuffer(value)); static final _$writeLogEntries = - $grpc.ClientMethod<$2.WriteLogEntriesRequest, $2.WriteLogEntriesResponse>( + $grpc.ClientMethod<$0.WriteLogEntriesRequest, $0.WriteLogEntriesResponse>( '/google.logging.v2.LoggingServiceV2/WriteLogEntries', - ($2.WriteLogEntriesRequest value) => value.writeToBuffer(), + ($0.WriteLogEntriesRequest value) => value.writeToBuffer(), ($core.List<$core.int> value) => - $2.WriteLogEntriesResponse.fromBuffer(value)); + $0.WriteLogEntriesResponse.fromBuffer(value)); static final _$listLogEntries = - $grpc.ClientMethod<$2.ListLogEntriesRequest, $2.ListLogEntriesResponse>( + $grpc.ClientMethod<$0.ListLogEntriesRequest, $0.ListLogEntriesResponse>( '/google.logging.v2.LoggingServiceV2/ListLogEntries', - ($2.ListLogEntriesRequest value) => value.writeToBuffer(), + ($0.ListLogEntriesRequest value) => value.writeToBuffer(), ($core.List<$core.int> value) => - $2.ListLogEntriesResponse.fromBuffer(value)); + $0.ListLogEntriesResponse.fromBuffer(value)); static final _$listMonitoredResourceDescriptors = $grpc.ClientMethod< - $2.ListMonitoredResourceDescriptorsRequest, - $2.ListMonitoredResourceDescriptorsResponse>( + $0.ListMonitoredResourceDescriptorsRequest, + $0.ListMonitoredResourceDescriptorsResponse>( '/google.logging.v2.LoggingServiceV2/ListMonitoredResourceDescriptors', - ($2.ListMonitoredResourceDescriptorsRequest value) => + ($0.ListMonitoredResourceDescriptorsRequest value) => value.writeToBuffer(), ($core.List<$core.int> value) => - $2.ListMonitoredResourceDescriptorsResponse.fromBuffer(value)); + $0.ListMonitoredResourceDescriptorsResponse.fromBuffer(value)); static final _$listLogs = - $grpc.ClientMethod<$2.ListLogsRequest, $2.ListLogsResponse>( + $grpc.ClientMethod<$0.ListLogsRequest, $0.ListLogsResponse>( '/google.logging.v2.LoggingServiceV2/ListLogs', - ($2.ListLogsRequest value) => value.writeToBuffer(), + ($0.ListLogsRequest value) => value.writeToBuffer(), ($core.List<$core.int> value) => - $2.ListLogsResponse.fromBuffer(value)); + $0.ListLogsResponse.fromBuffer(value)); static final _$tailLogEntries = - $grpc.ClientMethod<$2.TailLogEntriesRequest, $2.TailLogEntriesResponse>( + $grpc.ClientMethod<$0.TailLogEntriesRequest, $0.TailLogEntriesResponse>( '/google.logging.v2.LoggingServiceV2/TailLogEntries', - ($2.TailLogEntriesRequest value) => value.writeToBuffer(), + ($0.TailLogEntriesRequest value) => value.writeToBuffer(), ($core.List<$core.int> value) => - $2.TailLogEntriesResponse.fromBuffer(value)); + $0.TailLogEntriesResponse.fromBuffer(value)); LoggingServiceV2Client($grpc.ClientChannel channel, {$grpc.CallOptions? options, $core.Iterable<$grpc.ClientInterceptor>? interceptors}) : super(channel, options: options, interceptors: interceptors); - $grpc.ResponseFuture<$1.Empty> deleteLog($2.DeleteLogRequest request, + $grpc.ResponseFuture<$1.Empty> deleteLog($0.DeleteLogRequest request, {$grpc.CallOptions? options}) { return $createUnaryCall(_$deleteLog, request, options: options); } - $grpc.ResponseFuture<$2.WriteLogEntriesResponse> writeLogEntries( - $2.WriteLogEntriesRequest request, + $grpc.ResponseFuture<$0.WriteLogEntriesResponse> writeLogEntries( + $0.WriteLogEntriesRequest request, {$grpc.CallOptions? options}) { return $createUnaryCall(_$writeLogEntries, request, options: options); } - $grpc.ResponseFuture<$2.ListLogEntriesResponse> listLogEntries( - $2.ListLogEntriesRequest request, + $grpc.ResponseFuture<$0.ListLogEntriesResponse> listLogEntries( + $0.ListLogEntriesRequest request, {$grpc.CallOptions? options}) { return $createUnaryCall(_$listLogEntries, request, options: options); } - $grpc.ResponseFuture<$2.ListMonitoredResourceDescriptorsResponse> + $grpc.ResponseFuture<$0.ListMonitoredResourceDescriptorsResponse> listMonitoredResourceDescriptors( - $2.ListMonitoredResourceDescriptorsRequest request, + $0.ListMonitoredResourceDescriptorsRequest request, {$grpc.CallOptions? options}) { return $createUnaryCall(_$listMonitoredResourceDescriptors, request, options: options); } - $grpc.ResponseFuture<$2.ListLogsResponse> listLogs($2.ListLogsRequest request, + $grpc.ResponseFuture<$0.ListLogsResponse> listLogs($0.ListLogsRequest request, {$grpc.CallOptions? options}) { return $createUnaryCall(_$listLogs, request, options: options); } - $grpc.ResponseStream<$2.TailLogEntriesResponse> tailLogEntries( - $async.Stream<$2.TailLogEntriesRequest> request, + $grpc.ResponseStream<$0.TailLogEntriesResponse> tailLogEntries( + $async.Stream<$0.TailLogEntriesRequest> request, {$grpc.CallOptions? options}) { return $createStreamingCall(_$tailLogEntries, request, options: options); } @@ -98,100 +98,100 @@ abstract class LoggingServiceV2ServiceBase extends $grpc.Service { $core.String get $name => 'google.logging.v2.LoggingServiceV2'; LoggingServiceV2ServiceBase() { - $addMethod($grpc.ServiceMethod<$2.DeleteLogRequest, $1.Empty>( + $addMethod($grpc.ServiceMethod<$0.DeleteLogRequest, $1.Empty>( 'DeleteLog', deleteLog_Pre, false, false, - ($core.List<$core.int> value) => $2.DeleteLogRequest.fromBuffer(value), + ($core.List<$core.int> value) => $0.DeleteLogRequest.fromBuffer(value), ($1.Empty value) => value.writeToBuffer())); - $addMethod($grpc.ServiceMethod<$2.WriteLogEntriesRequest, - $2.WriteLogEntriesResponse>( + $addMethod($grpc.ServiceMethod<$0.WriteLogEntriesRequest, + $0.WriteLogEntriesResponse>( 'WriteLogEntries', writeLogEntries_Pre, false, false, ($core.List<$core.int> value) => - $2.WriteLogEntriesRequest.fromBuffer(value), - ($2.WriteLogEntriesResponse value) => value.writeToBuffer())); - $addMethod($grpc.ServiceMethod<$2.ListLogEntriesRequest, - $2.ListLogEntriesResponse>( + $0.WriteLogEntriesRequest.fromBuffer(value), + ($0.WriteLogEntriesResponse value) => value.writeToBuffer())); + $addMethod($grpc.ServiceMethod<$0.ListLogEntriesRequest, + $0.ListLogEntriesResponse>( 'ListLogEntries', listLogEntries_Pre, false, false, ($core.List<$core.int> value) => - $2.ListLogEntriesRequest.fromBuffer(value), - ($2.ListLogEntriesResponse value) => value.writeToBuffer())); - $addMethod($grpc.ServiceMethod<$2.ListMonitoredResourceDescriptorsRequest, - $2.ListMonitoredResourceDescriptorsResponse>( + $0.ListLogEntriesRequest.fromBuffer(value), + ($0.ListLogEntriesResponse value) => value.writeToBuffer())); + $addMethod($grpc.ServiceMethod<$0.ListMonitoredResourceDescriptorsRequest, + $0.ListMonitoredResourceDescriptorsResponse>( 'ListMonitoredResourceDescriptors', listMonitoredResourceDescriptors_Pre, false, false, ($core.List<$core.int> value) => - $2.ListMonitoredResourceDescriptorsRequest.fromBuffer(value), - ($2.ListMonitoredResourceDescriptorsResponse value) => + $0.ListMonitoredResourceDescriptorsRequest.fromBuffer(value), + ($0.ListMonitoredResourceDescriptorsResponse value) => value.writeToBuffer())); - $addMethod($grpc.ServiceMethod<$2.ListLogsRequest, $2.ListLogsResponse>( + $addMethod($grpc.ServiceMethod<$0.ListLogsRequest, $0.ListLogsResponse>( 'ListLogs', listLogs_Pre, false, false, - ($core.List<$core.int> value) => $2.ListLogsRequest.fromBuffer(value), - ($2.ListLogsResponse value) => value.writeToBuffer())); - $addMethod($grpc.ServiceMethod<$2.TailLogEntriesRequest, - $2.TailLogEntriesResponse>( + ($core.List<$core.int> value) => $0.ListLogsRequest.fromBuffer(value), + ($0.ListLogsResponse value) => value.writeToBuffer())); + $addMethod($grpc.ServiceMethod<$0.TailLogEntriesRequest, + $0.TailLogEntriesResponse>( 'TailLogEntries', tailLogEntries, true, true, ($core.List<$core.int> value) => - $2.TailLogEntriesRequest.fromBuffer(value), - ($2.TailLogEntriesResponse value) => value.writeToBuffer())); + $0.TailLogEntriesRequest.fromBuffer(value), + ($0.TailLogEntriesResponse value) => value.writeToBuffer())); } $async.Future<$1.Empty> deleteLog_Pre($grpc.ServiceCall call, - $async.Future<$2.DeleteLogRequest> request) async { + $async.Future<$0.DeleteLogRequest> request) async { return deleteLog(call, await request); } - $async.Future<$2.WriteLogEntriesResponse> writeLogEntries_Pre( + $async.Future<$0.WriteLogEntriesResponse> writeLogEntries_Pre( $grpc.ServiceCall call, - $async.Future<$2.WriteLogEntriesRequest> request) async { + $async.Future<$0.WriteLogEntriesRequest> request) async { return writeLogEntries(call, await request); } - $async.Future<$2.ListLogEntriesResponse> listLogEntries_Pre( + $async.Future<$0.ListLogEntriesResponse> listLogEntries_Pre( $grpc.ServiceCall call, - $async.Future<$2.ListLogEntriesRequest> request) async { + $async.Future<$0.ListLogEntriesRequest> request) async { return listLogEntries(call, await request); } - $async.Future<$2.ListMonitoredResourceDescriptorsResponse> + $async.Future<$0.ListMonitoredResourceDescriptorsResponse> listMonitoredResourceDescriptors_Pre( $grpc.ServiceCall call, - $async.Future<$2.ListMonitoredResourceDescriptorsRequest> + $async.Future<$0.ListMonitoredResourceDescriptorsRequest> request) async { return listMonitoredResourceDescriptors(call, await request); } - $async.Future<$2.ListLogsResponse> listLogs_Pre( - $grpc.ServiceCall call, $async.Future<$2.ListLogsRequest> request) async { + $async.Future<$0.ListLogsResponse> listLogs_Pre( + $grpc.ServiceCall call, $async.Future<$0.ListLogsRequest> request) async { return listLogs(call, await request); } $async.Future<$1.Empty> deleteLog( - $grpc.ServiceCall call, $2.DeleteLogRequest request); - $async.Future<$2.WriteLogEntriesResponse> writeLogEntries( - $grpc.ServiceCall call, $2.WriteLogEntriesRequest request); - $async.Future<$2.ListLogEntriesResponse> listLogEntries( - $grpc.ServiceCall call, $2.ListLogEntriesRequest request); - $async.Future<$2.ListMonitoredResourceDescriptorsResponse> + $grpc.ServiceCall call, $0.DeleteLogRequest request); + $async.Future<$0.WriteLogEntriesResponse> writeLogEntries( + $grpc.ServiceCall call, $0.WriteLogEntriesRequest request); + $async.Future<$0.ListLogEntriesResponse> listLogEntries( + $grpc.ServiceCall call, $0.ListLogEntriesRequest request); + $async.Future<$0.ListMonitoredResourceDescriptorsResponse> listMonitoredResourceDescriptors($grpc.ServiceCall call, - $2.ListMonitoredResourceDescriptorsRequest request); - $async.Future<$2.ListLogsResponse> listLogs( - $grpc.ServiceCall call, $2.ListLogsRequest request); - $async.Stream<$2.TailLogEntriesResponse> tailLogEntries( - $grpc.ServiceCall call, $async.Stream<$2.TailLogEntriesRequest> request); + $0.ListMonitoredResourceDescriptorsRequest request); + $async.Future<$0.ListLogsResponse> listLogs( + $grpc.ServiceCall call, $0.ListLogsRequest request); + $async.Stream<$0.TailLogEntriesResponse> tailLogEntries( + $grpc.ServiceCall call, $async.Stream<$0.TailLogEntriesRequest> request); } 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 be526b10..7f737ba0 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 @@ -3,7 +3,7 @@ // source: google/logging/v2/logging.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; import 'dart:convert' as $convert; @@ -318,7 +318,7 @@ const ListLogsRequest$json = const { /// Descriptor for `ListLogsRequest`. Decode as a `google.protobuf.DescriptorProto`. final $typed_data.Uint8List listLogsRequestDescriptor = $convert.base64Decode( - 'Cg9MaXN0TG9nc1JlcXVlc3QSOgoGcGFyZW50GAEgASgJQiLgQQL6QRwSGmxvZ2dpbmcuZ29vZ2xlYXBpcy5jb20vTG9nUgZwYXJlbnQSIAoJcGFnZV9zaXplGAIgASgFQgPgQQFSCHBhZ2VTaXplEiIKCnBhZ2VfdG9rZW4YAyABKAlCA+BBAVIJcGFnZVRva2VuEioKDnJlc291cmNlX25hbWVzGAggAygJQgPgQQFSDXJlc291cmNlTmFtZXM='); + 'Cg9MaXN0TG9nc1JlcXVlc3QSOgoGcGFyZW50GAEgASgJQiLgQQL6QRwSGmxvZ2dpbmcuZ29vZ2xlYXBpcy5jb20vTG9nUgZwYXJlbnQSIAoJcGFnZV9zaXplGAIgASgFQgPgQQFSCHBhZ2VTaXplEiIKCnBhZ2VfdG9rZW4YAyABKAlCA+BBAVIJcGFnZVRva2VuEkkKDnJlc291cmNlX25hbWVzGAggAygJQiLgQQH6QRwSGmxvZ2dpbmcuZ29vZ2xlYXBpcy5jb20vTG9nUg1yZXNvdXJjZU5hbWVz'); @$core.Deprecated('Use listLogsResponseDescriptor instead') const ListLogsResponse$json = const { '1': 'ListLogsResponse', 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 81fcf726..97735734 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/any.pb.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/any.pb.dart @@ -3,7 +3,7 @@ // source: google/protobuf/any.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; 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 e03f029c..22fd9d83 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/any.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/any.pbenum.dart @@ -3,4 +3,4 @@ // source: google/protobuf/any.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name 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 1ad2e301..67187d07 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/any.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/any.pbjson.dart @@ -3,7 +3,7 @@ // source: google/protobuf/any.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; import 'dart:convert' as $convert; 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 07338766..4fe97475 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/duration.pb.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/duration.pb.dart @@ -3,7 +3,7 @@ // source: google/protobuf/duration.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; 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 af4119e7..e4337cf9 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/duration.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/duration.pbenum.dart @@ -3,4 +3,4 @@ // source: google/protobuf/duration.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name 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 ef0dcc64..22edbacd 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/duration.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/duration.pbjson.dart @@ -3,7 +3,7 @@ // source: google/protobuf/duration.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; import 'dart:convert' as $convert; 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 fda8ba1d..bacdf8f1 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/empty.pb.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/empty.pb.dart @@ -3,7 +3,7 @@ // source: google/protobuf/empty.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; 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 73caaaf4..5a3bcbfe 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/empty.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/empty.pbenum.dart @@ -3,4 +3,4 @@ // source: google/protobuf/empty.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name 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 001c2489..aa9a51df 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/empty.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/empty.pbjson.dart @@ -3,7 +3,7 @@ // source: google/protobuf/empty.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; import 'dart:convert' as $convert; 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 03ab3797..f64ac49a 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/struct.pb.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/struct.pb.dart @@ -3,7 +3,7 @@ // source: google/protobuf/struct.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; 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 10e8a6a0..223f5f79 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/struct.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/struct.pbenum.dart @@ -3,7 +3,7 @@ // source: google/protobuf/struct.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name // ignore_for_file: UNDEFINED_SHOWN_NAME import 'dart:core' as $core; 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 19026930..44c73d80 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/struct.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/struct.pbjson.dart @@ -3,7 +3,7 @@ // source: google/protobuf/struct.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; import 'dart:convert' as $convert; 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 a3416608..db830f15 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/timestamp.pb.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/timestamp.pb.dart @@ -3,7 +3,7 @@ // source: google/protobuf/timestamp.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; 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 78b6cb53..5b33f423 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/timestamp.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/timestamp.pbenum.dart @@ -3,4 +3,4 @@ // source: google/protobuf/timestamp.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name 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 1ae3997a..b89d3cf1 100644 --- a/example/googleapis/lib/src/generated/google/protobuf/timestamp.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/protobuf/timestamp.pbjson.dart @@ -3,7 +3,7 @@ // source: google/protobuf/timestamp.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; import 'dart:convert' as $convert; 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 718cc9c8..84e13aa5 100644 --- a/example/googleapis/lib/src/generated/google/rpc/status.pb.dart +++ b/example/googleapis/lib/src/generated/google/rpc/status.pb.dart @@ -3,7 +3,7 @@ // source: google/rpc/status.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; 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 290e941f..6ae53627 100644 --- a/example/googleapis/lib/src/generated/google/rpc/status.pbenum.dart +++ b/example/googleapis/lib/src/generated/google/rpc/status.pbenum.dart @@ -3,4 +3,4 @@ // source: google/rpc/status.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name 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 a8037c8a..27c6cafe 100644 --- a/example/googleapis/lib/src/generated/google/rpc/status.pbjson.dart +++ b/example/googleapis/lib/src/generated/google/rpc/status.pbjson.dart @@ -3,7 +3,7 @@ // source: google/rpc/status.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; import 'dart:convert' as $convert; diff --git a/example/googleapis/pubspec.yaml b/example/googleapis/pubspec.yaml index 8c8a3caf..ce28e535 100644 --- a/example/googleapis/pubspec.yaml +++ b/example/googleapis/pubspec.yaml @@ -7,9 +7,11 @@ environment: dependencies: async: ^2.2.0 + fixnum: grpc: path: ../../ protobuf: ^2.0.0 dev_dependencies: + lints: ^2.0.0 test: ^1.6.4 diff --git a/example/googleapis/tool/regenerate.sh b/example/googleapis/tool/regenerate.sh index 4f9b6a16..6bfc5d5e 100755 --- a/example/googleapis/tool/regenerate.sh +++ b/example/googleapis/tool/regenerate.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash if [ ! -d "$PROTOBUF" ]; then - echo "Please set the PROTOBUF environment variable to your clone of google/protobuf." + echo "Please set the PROTOBUF environment variable to your clone of protocolbuffers/protobuf." exit -1 fi diff --git a/example/grpc-web/lib/src/generated/echo.pb.dart b/example/grpc-web/lib/src/generated/echo.pb.dart index 4f2165db..44512dac 100644 --- a/example/grpc-web/lib/src/generated/echo.pb.dart +++ b/example/grpc-web/lib/src/generated/echo.pb.dart @@ -3,7 +3,7 @@ // source: echo.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; diff --git a/example/grpc-web/lib/src/generated/echo.pbenum.dart b/example/grpc-web/lib/src/generated/echo.pbenum.dart index 01eb863f..dae04226 100644 --- a/example/grpc-web/lib/src/generated/echo.pbenum.dart +++ b/example/grpc-web/lib/src/generated/echo.pbenum.dart @@ -3,4 +3,4 @@ // source: echo.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name diff --git a/example/grpc-web/lib/src/generated/echo.pbgrpc.dart b/example/grpc-web/lib/src/generated/echo.pbgrpc.dart index fb02fe4f..e5c093ea 100644 --- a/example/grpc-web/lib/src/generated/echo.pbgrpc.dart +++ b/example/grpc-web/lib/src/generated/echo.pbgrpc.dart @@ -3,7 +3,7 @@ // source: echo.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:async' as $async; diff --git a/example/grpc-web/lib/src/generated/echo.pbjson.dart b/example/grpc-web/lib/src/generated/echo.pbjson.dart index 67de8da9..d1adba55 100644 --- a/example/grpc-web/lib/src/generated/echo.pbjson.dart +++ b/example/grpc-web/lib/src/generated/echo.pbjson.dart @@ -3,7 +3,7 @@ // source: echo.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; import 'dart:convert' as $convert; diff --git a/example/grpc-web/pubspec.yaml b/example/grpc-web/pubspec.yaml index 35d58a3c..65b7efbe 100644 --- a/example/grpc-web/pubspec.yaml +++ b/example/grpc-web/pubspec.yaml @@ -13,3 +13,4 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 build_web_compilers: ^3.0.0 + lints: ^2.0.0 diff --git a/example/helloworld/lib/src/generated/helloworld.pb.dart b/example/helloworld/lib/src/generated/helloworld.pb.dart index 3b684b70..03e55ed9 100644 --- a/example/helloworld/lib/src/generated/helloworld.pb.dart +++ b/example/helloworld/lib/src/generated/helloworld.pb.dart @@ -3,7 +3,7 @@ // source: helloworld.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; diff --git a/example/helloworld/lib/src/generated/helloworld.pbenum.dart b/example/helloworld/lib/src/generated/helloworld.pbenum.dart index c11fcf0a..aa941530 100644 --- a/example/helloworld/lib/src/generated/helloworld.pbenum.dart +++ b/example/helloworld/lib/src/generated/helloworld.pbenum.dart @@ -3,4 +3,4 @@ // source: helloworld.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name diff --git a/example/helloworld/lib/src/generated/helloworld.pbgrpc.dart b/example/helloworld/lib/src/generated/helloworld.pbgrpc.dart index fa4f2ff7..9ba3aa32 100644 --- a/example/helloworld/lib/src/generated/helloworld.pbgrpc.dart +++ b/example/helloworld/lib/src/generated/helloworld.pbgrpc.dart @@ -3,7 +3,7 @@ // source: helloworld.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:async' as $async; diff --git a/example/helloworld/lib/src/generated/helloworld.pbjson.dart b/example/helloworld/lib/src/generated/helloworld.pbjson.dart index 8eafa21d..a4a9fc04 100644 --- a/example/helloworld/lib/src/generated/helloworld.pbjson.dart +++ b/example/helloworld/lib/src/generated/helloworld.pbjson.dart @@ -3,7 +3,7 @@ // source: helloworld.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; import 'dart:convert' as $convert; diff --git a/example/helloworld/pubspec.yaml b/example/helloworld/pubspec.yaml index 7eb3e18d..cfb7063f 100644 --- a/example/helloworld/pubspec.yaml +++ b/example/helloworld/pubspec.yaml @@ -10,3 +10,6 @@ dependencies: grpc: path: ../../ protobuf: ^2.0.0 + +dev_dependencies: + lints: ^2.0.0 diff --git a/example/metadata/lib/src/generated/metadata.pb.dart b/example/metadata/lib/src/generated/metadata.pb.dart index 65f557ee..ae06e738 100644 --- a/example/metadata/lib/src/generated/metadata.pb.dart +++ b/example/metadata/lib/src/generated/metadata.pb.dart @@ -3,7 +3,7 @@ // 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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; diff --git a/example/metadata/lib/src/generated/metadata.pbenum.dart b/example/metadata/lib/src/generated/metadata.pbenum.dart deleted file mode 100644 index 19d7663d..00000000 --- a/example/metadata/lib/src/generated/metadata.pbenum.dart +++ /dev/null @@ -1,6 +0,0 @@ -/// -// 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 ee26c3e3..ad24d0fd 100644 --- a/example/metadata/lib/src/generated/metadata.pbgrpc.dart +++ b/example/metadata/lib/src/generated/metadata.pbgrpc.dart @@ -3,7 +3,7 @@ // 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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:async' as $async; diff --git a/example/metadata/lib/src/generated/metadata.pbjson.dart b/example/metadata/lib/src/generated/metadata.pbjson.dart deleted file mode 100644 index ff8a981d..00000000 --- a/example/metadata/lib/src/generated/metadata.pbjson.dart +++ /dev/null @@ -1,41 +0,0 @@ -/// -// 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 17225b7b..26f95b79 100644 --- a/example/metadata/lib/src/server.dart +++ b/example/metadata/lib/src/server.dart @@ -27,7 +27,7 @@ class MetadataService extends MetadataServiceBase { final peer = call.clientMetadata!['peer']!; final count = callCount++; print('Echo: Call #$count: Peer: $peer, request: ${request.value}'); - call.headers!['count'] = '${count}'; + call.headers!['count'] = '$count'; call.trailers!['hello'] = request.value; final delay = call.clientMetadata!['delay']; diff --git a/example/metadata/pubspec.yaml b/example/metadata/pubspec.yaml index 7665a472..cf7bc071 100644 --- a/example/metadata/pubspec.yaml +++ b/example/metadata/pubspec.yaml @@ -12,4 +12,5 @@ dependencies: protobuf: ^2.0.0 dev_dependencies: + lints: ^2.0.0 test: ^1.6.0 diff --git a/example/metadata/tool/regenerate.sh b/example/metadata/tool/regenerate.sh index 65e2a27b..a8b5b6d0 100755 --- a/example/metadata/tool/regenerate.sh +++ b/example/metadata/tool/regenerate.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash protoc --dart_out=grpc:lib/src/generated -Iprotos protos/metadata.proto rm lib/src/generated/metadata.pb{enum,json}.dart -dartfmt -w lib/src/generated +dart format -o write lib/src/generated 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 c9d3407b..af1b4918 100644 --- a/example/route_guide/lib/src/generated/route_guide.pb.dart +++ b/example/route_guide/lib/src/generated/route_guide.pb.dart @@ -3,7 +3,7 @@ // source: route_guide.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; 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 31f6c4a4..5cafe250 100644 --- a/example/route_guide/lib/src/generated/route_guide.pbenum.dart +++ b/example/route_guide/lib/src/generated/route_guide.pbenum.dart @@ -3,4 +3,4 @@ // source: route_guide.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name 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 57fe24f1..62d98a35 100644 --- a/example/route_guide/lib/src/generated/route_guide.pbgrpc.dart +++ b/example/route_guide/lib/src/generated/route_guide.pbgrpc.dart @@ -3,7 +3,7 @@ // source: route_guide.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:async' as $async; 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 c277848b..af8eb55d 100644 --- a/example/route_guide/lib/src/generated/route_guide.pbjson.dart +++ b/example/route_guide/lib/src/generated/route_guide.pbjson.dart @@ -3,7 +3,7 @@ // source: route_guide.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; import 'dart:convert' as $convert; diff --git a/example/route_guide/pubspec.yaml b/example/route_guide/pubspec.yaml index d74f74f0..3a987423 100644 --- a/example/route_guide/pubspec.yaml +++ b/example/route_guide/pubspec.yaml @@ -11,3 +11,6 @@ dependencies: path: ../../ protobuf: ^2.0.0 collection: ^1.15.0-nullsafety.4 + +dev_dependencies: + lints: ^2.0.0 diff --git a/interop/lib/src/generated/empty.pb.dart b/interop/lib/src/generated/empty.pb.dart index 5d81eb8a..1a07ec7d 100644 --- a/interop/lib/src/generated/empty.pb.dart +++ b/interop/lib/src/generated/empty.pb.dart @@ -3,7 +3,7 @@ // source: empty.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; diff --git a/interop/lib/src/generated/messages.pb.dart b/interop/lib/src/generated/messages.pb.dart index b659a1c3..7d54ce07 100644 --- a/interop/lib/src/generated/messages.pb.dart +++ b/interop/lib/src/generated/messages.pb.dart @@ -3,7 +3,7 @@ // source: messages.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; @@ -1181,7 +1181,7 @@ class ReconnectInfo extends $pb.GeneratedMessage { const $core.bool.fromEnvironment('protobuf.omit_field_names') ? '' : 'backoffMs', - $pb.PbFieldType.P3) + $pb.PbFieldType.K3) ..hasRequiredFields = false; ReconnectInfo._() : super(); diff --git a/interop/lib/src/generated/messages.pbenum.dart b/interop/lib/src/generated/messages.pbenum.dart index f7ba49ef..9927b165 100644 --- a/interop/lib/src/generated/messages.pbenum.dart +++ b/interop/lib/src/generated/messages.pbenum.dart @@ -3,7 +3,7 @@ // source: messages.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name // ignore_for_file: UNDEFINED_SHOWN_NAME import 'dart:core' as $core; diff --git a/interop/lib/src/generated/test.pb.dart b/interop/lib/src/generated/test.pb.dart index d7fd8e58..f86430b7 100644 --- a/interop/lib/src/generated/test.pb.dart +++ b/interop/lib/src/generated/test.pb.dart @@ -3,6 +3,6 @@ // source: test.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; diff --git a/interop/lib/src/generated/test.pbgrpc.dart b/interop/lib/src/generated/test.pbgrpc.dart index dd5854a7..76c9521c 100644 --- a/interop/lib/src/generated/test.pbgrpc.dart +++ b/interop/lib/src/generated/test.pbgrpc.dart @@ -3,7 +3,7 @@ // source: test.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:async' as $async; diff --git a/interop/tool/regenerate.sh b/interop/tool/regenerate.sh index 066a0f93..b8e84f99 100755 --- a/interop/tool/regenerate.sh +++ b/interop/tool/regenerate.sh @@ -3,4 +3,4 @@ mkdir -p lib/src/generated protoc --dart_out=grpc:lib/src/generated -Iprotos/ protos/*.proto rm lib/src/generated/*.pbjson.dart rm lib/src/generated/{empty,test}.pbenum.dart -dartfmt -w lib/src/generated +dart format -o write lib/src/generated diff --git a/lib/grpc_or_grpcweb.dart b/lib/grpc_or_grpcweb.dart index a3eabceb..b23bed5d 100644 --- a/lib/grpc_or_grpcweb.dart +++ b/lib/grpc_or_grpcweb.dart @@ -34,34 +34,23 @@ export 'src/shared/api.dart'; /// provided for each case. class GrpcOrGrpcWebClientChannel extends GrpcOrGrpcWebClientChannelInternal { GrpcOrGrpcWebClientChannel.toSeparateEndpoints({ - required String grpcHost, - required int grpcPort, - required bool grpcTransportSecure, - required String grpcWebHost, - required int grpcWebPort, - required bool grpcWebTransportSecure, - }) : super( - grpcHost: grpcHost, - grpcPort: grpcPort, - grpcTransportSecure: grpcTransportSecure, - grpcWebHost: grpcWebHost, - grpcWebPort: grpcWebPort, - grpcWebTransportSecure: grpcWebTransportSecure, - ); + required super.grpcHost, + required super.grpcPort, + required super.grpcTransportSecure, + required super.grpcWebHost, + required super.grpcWebPort, + required super.grpcWebTransportSecure, + }); GrpcOrGrpcWebClientChannel.toSeparatePorts({ required String host, - required int grpcPort, - required bool grpcTransportSecure, - required int grpcWebPort, - required bool grpcWebTransportSecure, + required super.grpcPort, + required super.grpcTransportSecure, + required super.grpcWebPort, + required super.grpcWebTransportSecure, }) : super( grpcHost: host, - grpcPort: grpcPort, - grpcTransportSecure: grpcTransportSecure, grpcWebHost: host, - grpcWebPort: grpcWebPort, - grpcWebTransportSecure: grpcWebTransportSecure, ); GrpcOrGrpcWebClientChannel.toSingleEndpoint({ @@ -78,8 +67,8 @@ class GrpcOrGrpcWebClientChannel extends GrpcOrGrpcWebClientChannelInternal { ); GrpcOrGrpcWebClientChannel.grpc( - Object host, { - int port = 443, - ChannelOptions options = const ChannelOptions(), - }) : super.grpc(host, port: port, options: options); + super.host, { + super.port = 443, + super.options = const ChannelOptions(), + }) : super.grpc(); } diff --git a/lib/src/auth/auth_io.dart b/lib/src/auth/auth_io.dart index ed20cd14..e8368b25 100644 --- a/lib/src/auth/auth_io.dart +++ b/lib/src/auth/auth_io.dart @@ -118,7 +118,7 @@ Future applicationDefaultCredentialsAuthenticator( // Attempt to load form credFile, if detected if (credFile != null) { - var credentials; + Object? credentials; try { credentials = json.decode(await credFile.readAsString()); } on IOException { diff --git a/lib/src/auth/rsa.dart b/lib/src/auth/rsa.dart index a1669b1c..0f154ee1 100644 --- a/lib/src/auth/rsa.dart +++ b/lib/src/auth/rsa.dart @@ -30,7 +30,7 @@ class RS256Signer { // NIST sha-256 OID (2 16 840 1 101 3 4 2 1) // See a reference for the encoding here: // http://msdn.microsoft.com/en-us/library/bb540809%28v=vs.85%29.aspx - static const _RSA_SHA256_ALGORITHM_IDENTIFIER = [ + static const _rsaSha256AlgorithmIdentifier = [ 0x06, 0x09, 0x60, @@ -69,21 +69,21 @@ class RS256Signer { // } var offset = 0; final digestInfo = Uint8List( - 2 + 2 + _RSA_SHA256_ALGORITHM_IDENTIFIER.length + 2 + 2 + hash.length); + 2 + 2 + _rsaSha256AlgorithmIdentifier.length + 2 + 2 + hash.length); { // DigestInfo - digestInfo[offset++] = ASN1Parser.SEQUENCE_TAG; + digestInfo[offset++] = ASN1Parser.sequenceTag; digestInfo[offset++] = digestInfo.length - 2; { // AlgorithmIdentifier. - digestInfo[offset++] = ASN1Parser.SEQUENCE_TAG; - digestInfo[offset++] = _RSA_SHA256_ALGORITHM_IDENTIFIER.length + 2; - digestInfo.setAll(offset, _RSA_SHA256_ALGORITHM_IDENTIFIER); - offset += _RSA_SHA256_ALGORITHM_IDENTIFIER.length; - digestInfo[offset++] = ASN1Parser.NULL_TAG; + digestInfo[offset++] = ASN1Parser.sequenceTag; + digestInfo[offset++] = _rsaSha256AlgorithmIdentifier.length + 2; + digestInfo.setAll(offset, _rsaSha256AlgorithmIdentifier); + offset += _rsaSha256AlgorithmIdentifier.length; + digestInfo[offset++] = ASN1Parser.nullTag; digestInfo[offset++] = 0; } - digestInfo[offset++] = ASN1Parser.OCTET_STRING_TAG; + digestInfo[offset++] = ASN1Parser.octetStringTag; digestInfo[offset++] = hash.length; digestInfo.setAll(offset, hash); } @@ -92,11 +92,11 @@ class RS256Signer { } class ASN1Parser { - static const INTEGER_TAG = 0x02; - static const OCTET_STRING_TAG = 0x04; - static const NULL_TAG = 0x05; - static const OBJECT_ID_TAG = 0x06; - static const SEQUENCE_TAG = 0x30; + static const integerTag = 0x02; + static const octetStringTag = 0x04; + static const nullTag = 0x05; + static const objectIdTag = 0x06; + static const sequenceTag = 0x30; static ASN1Object parse(Uint8List bytes) { Never invalidFormat(String msg) { @@ -157,19 +157,19 @@ class ASN1Parser { checkNBytesAvailable(1); final tag = bytes[offset++]; switch (tag) { - case INTEGER_TAG: + case integerTag: final size = readEncodedLength(); return ASN1Integer(RSAAlgorithm.bytes2BigInt(readBytes(size))); - case OCTET_STRING_TAG: + case octetStringTag: final size = readEncodedLength(); return ASN1OctetString(readBytes(size)); - case NULL_TAG: + case nullTag: readNullBytes(); return ASN1Null(); - case OBJECT_ID_TAG: + case objectIdTag: final size = readEncodedLength(); return ASN1ObjectIdentifier(readBytes(size)); - case SEQUENCE_TAG: + case sequenceTag: final lengthInBytes = readEncodedLength(); if ((offset + lengthInBytes) > end) { invalidFormat('Tried to read more bytes than available.'); diff --git a/lib/src/client/grpc_or_grpcweb_channel_grpc.dart b/lib/src/client/grpc_or_grpcweb_channel_grpc.dart index ec335e4d..53a6d11c 100644 --- a/lib/src/client/grpc_or_grpcweb_channel_grpc.dart +++ b/lib/src/client/grpc_or_grpcweb_channel_grpc.dart @@ -36,8 +36,8 @@ class GrpcOrGrpcWebClientChannelInternal extends ClientChannel { ); GrpcOrGrpcWebClientChannelInternal.grpc( - Object host, { - required int port, - required ChannelOptions options, - }) : super(host, port: port, options: options); + super.host, { + required super.port, + required super.options, + }); } diff --git a/lib/src/client/http2_connection.dart b/lib/src/client/http2_connection.dart index 5fc6d422..10e98805 100644 --- a/lib/src/client/http2_connection.dart +++ b/lib/src/client/http2_connection.dart @@ -193,7 +193,7 @@ class Http2ClientConnection implements connection.ClientConnection { @override Future shutdown() async { - if (_state == ConnectionState.shutdown) return null; + if (_state == ConnectionState.shutdown) return; _setShutdownState(); await _transportConnection?.finish(); } @@ -254,7 +254,9 @@ class Http2ClientConnection implements connection.ClientConnection { } // TODO(jakobr): Log error. _cancelTimer(); - _pendingCalls.forEach((call) => _failCall(call, error)); + for (var call in _pendingCalls) { + _failCall(call, error); + } _pendingCalls.clear(); _setState(ConnectionState.idle); } @@ -361,9 +363,9 @@ class _SocketTransportConnector implements ClientTransportConnector { String _makeAuthority() { final host = _host; final portSuffix = _port == 443 ? '' : ':$_port'; - final hostName; + final String hostName; if (host is String) { - hostName = '$host'; + hostName = host; } else { host as InternetAddress; if (host.type == InternetAddressType.unix) { diff --git a/lib/src/client/transport/web_streams.dart b/lib/src/client/transport/web_streams.dart index 7fa9c774..3c0b0743 100644 --- a/lib/src/client/transport/web_streams.dart +++ b/lib/src/client/transport/web_streams.dart @@ -20,7 +20,7 @@ import 'dart:typed_data'; import '../../shared/message.dart'; import '../../shared/status.dart'; -enum _GrpcWebParseState { Init, Length, Message } +enum _GrpcWebParseState { init, length, message } class GrpcWebDecoder extends Converter { @override @@ -46,7 +46,7 @@ class _GrpcWebConversionSink extends ChunkedConversionSink { final _dataHeader = Uint8List(4); - _GrpcWebParseState _state = _GrpcWebParseState.Init; + _GrpcWebParseState _state = _GrpcWebParseState.init; var _chunkOffset = 0; int? _frameType; var _dataOffset = 0; @@ -58,9 +58,9 @@ class _GrpcWebConversionSink extends ChunkedConversionSink { final frameType = chunkData[_chunkOffset]; _chunkOffset++; if (frameType != frameTypeData && frameType != frameTypeTrailers) { - throw GrpcError.unimplemented('Invalid frame type: ${frameType}'); + throw GrpcError.unimplemented('Invalid frame type: $frameType'); } - _state = _GrpcWebParseState.Length; + _state = _GrpcWebParseState.length; return frameType; } @@ -77,7 +77,7 @@ class _GrpcWebConversionSink extends ChunkedConversionSink { if (_dataOffset == _dataHeader.lengthInBytes) { final dataLength = _dataHeader.buffer.asByteData().getUint32(0); _dataOffset = 0; - _state = _GrpcWebParseState.Message; + _state = _GrpcWebParseState.message; _data = Uint8List(dataLength); if (dataLength == 0) { // empty message @@ -112,7 +112,7 @@ class _GrpcWebConversionSink extends ChunkedConversionSink { _out.add(GrpcMetadata(headers)); break; } - _state = _GrpcWebParseState.Init; + _state = _GrpcWebParseState.init; _data = null; _dataOffset = 0; } @@ -134,13 +134,13 @@ class _GrpcWebConversionSink extends ChunkedConversionSink { final chunkData = chunk.asUint8List(); while (_chunkOffset < chunk.lengthInBytes) { switch (_state) { - case _GrpcWebParseState.Init: + case _GrpcWebParseState.init: _frameType = _parseFrameType(chunkData); break; - case _GrpcWebParseState.Length: + case _GrpcWebParseState.length: _parseLength(chunkData); break; - case _GrpcWebParseState.Message: + case _GrpcWebParseState.message: _parseMessage(chunkData); break; } diff --git a/lib/src/generated/google/protobuf/any.pb.dart b/lib/src/generated/google/protobuf/any.pb.dart index 81fcf726..97735734 100644 --- a/lib/src/generated/google/protobuf/any.pb.dart +++ b/lib/src/generated/google/protobuf/any.pb.dart @@ -3,7 +3,7 @@ // source: google/protobuf/any.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; diff --git a/lib/src/generated/google/protobuf/any.pbenum.dart b/lib/src/generated/google/protobuf/any.pbenum.dart index e03f029c..22fd9d83 100644 --- a/lib/src/generated/google/protobuf/any.pbenum.dart +++ b/lib/src/generated/google/protobuf/any.pbenum.dart @@ -3,4 +3,4 @@ // source: google/protobuf/any.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name diff --git a/lib/src/generated/google/protobuf/any.pbjson.dart b/lib/src/generated/google/protobuf/any.pbjson.dart index 696648f8..67187d07 100644 --- a/lib/src/generated/google/protobuf/any.pbjson.dart +++ b/lib/src/generated/google/protobuf/any.pbjson.dart @@ -3,10 +3,13 @@ // source: google/protobuf/any.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; +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 [ @@ -14,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/lib/src/generated/google/protobuf/duration.pb.dart b/lib/src/generated/google/protobuf/duration.pb.dart index 07338766..4fe97475 100644 --- a/lib/src/generated/google/protobuf/duration.pb.dart +++ b/lib/src/generated/google/protobuf/duration.pb.dart @@ -3,7 +3,7 @@ // source: google/protobuf/duration.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; diff --git a/lib/src/generated/google/protobuf/duration.pbenum.dart b/lib/src/generated/google/protobuf/duration.pbenum.dart index af4119e7..e4337cf9 100644 --- a/lib/src/generated/google/protobuf/duration.pbenum.dart +++ b/lib/src/generated/google/protobuf/duration.pbenum.dart @@ -3,4 +3,4 @@ // source: google/protobuf/duration.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name diff --git a/lib/src/generated/google/protobuf/duration.pbjson.dart b/lib/src/generated/google/protobuf/duration.pbjson.dart index 9b45a6b2..22edbacd 100644 --- a/lib/src/generated/google/protobuf/duration.pbjson.dart +++ b/lib/src/generated/google/protobuf/duration.pbjson.dart @@ -3,10 +3,13 @@ // source: google/protobuf/duration.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; +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 [ @@ -14,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/lib/src/generated/google/rpc/code.pb.dart b/lib/src/generated/google/rpc/code.pb.dart index 7f4e72c0..09b42968 100644 --- a/lib/src/generated/google/rpc/code.pb.dart +++ b/lib/src/generated/google/rpc/code.pb.dart @@ -3,7 +3,7 @@ // source: google/rpc/code.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; diff --git a/lib/src/generated/google/rpc/code.pbenum.dart b/lib/src/generated/google/rpc/code.pbenum.dart index 81035310..79bb6714 100644 --- a/lib/src/generated/google/rpc/code.pbenum.dart +++ b/lib/src/generated/google/rpc/code.pbenum.dart @@ -3,7 +3,7 @@ // source: google/rpc/code.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name // ignore_for_file: UNDEFINED_SHOWN_NAME import 'dart:core' as $core; diff --git a/lib/src/generated/google/rpc/code.pbjson.dart b/lib/src/generated/google/rpc/code.pbjson.dart index 0c46b5fe..5c21c4f2 100644 --- a/lib/src/generated/google/rpc/code.pbjson.dart +++ b/lib/src/generated/google/rpc/code.pbjson.dart @@ -3,10 +3,13 @@ // source: google/rpc/code.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; +@$core.Deprecated('Use codeDescriptor instead') const Code$json = const { '1': 'Code', '2': const [ @@ -29,3 +32,7 @@ const Code$json = const { const {'1': 'DATA_LOSS', '2': 15}, ], }; + +/// Descriptor for `Code`. Decode as a `google.protobuf.EnumDescriptorProto`. +final $typed_data.Uint8List codeDescriptor = $convert.base64Decode( + 'CgRDb2RlEgYKAk9LEAASDQoJQ0FOQ0VMTEVEEAESCwoHVU5LTk9XThACEhQKEElOVkFMSURfQVJHVU1FTlQQAxIVChFERUFETElORV9FWENFRURFRBAEEg0KCU5PVF9GT1VORBAFEhIKDkFMUkVBRFlfRVhJU1RTEAYSFQoRUEVSTUlTU0lPTl9ERU5JRUQQBxITCg9VTkFVVEhFTlRJQ0FURUQQEBIWChJSRVNPVVJDRV9FWEhBVVNURUQQCBIXChNGQUlMRURfUFJFQ09ORElUSU9OEAkSCwoHQUJPUlRFRBAKEhAKDE9VVF9PRl9SQU5HRRALEhEKDVVOSU1QTEVNRU5URUQQDBIMCghJTlRFUk5BTBANEg8KC1VOQVZBSUxBQkxFEA4SDQoJREFUQV9MT1NTEA8='); diff --git a/lib/src/generated/google/rpc/error_details.pb.dart b/lib/src/generated/google/rpc/error_details.pb.dart index 59dd91df..61b26a88 100644 --- a/lib/src/generated/google/rpc/error_details.pb.dart +++ b/lib/src/generated/google/rpc/error_details.pb.dart @@ -3,7 +3,7 @@ // source: google/rpc/error_details.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; diff --git a/lib/src/generated/google/rpc/error_details.pbenum.dart b/lib/src/generated/google/rpc/error_details.pbenum.dart index dc406033..33b1a93b 100644 --- a/lib/src/generated/google/rpc/error_details.pbenum.dart +++ b/lib/src/generated/google/rpc/error_details.pbenum.dart @@ -3,4 +3,4 @@ // source: google/rpc/error_details.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name diff --git a/lib/src/generated/google/rpc/error_details.pbjson.dart b/lib/src/generated/google/rpc/error_details.pbjson.dart index d1071f93..7c36b195 100644 --- a/lib/src/generated/google/rpc/error_details.pbjson.dart +++ b/lib/src/generated/google/rpc/error_details.pbjson.dart @@ -3,10 +3,13 @@ // source: google/rpc/error_details.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; +import 'dart:convert' as $convert; +import 'dart:typed_data' as $typed_data; +@$core.Deprecated('Use retryInfoDescriptor instead') const RetryInfo$json = const { '1': 'RetryInfo', '2': const [ @@ -21,6 +24,10 @@ const RetryInfo$json = const { ], }; +/// Descriptor for `RetryInfo`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List retryInfoDescriptor = $convert.base64Decode( + 'CglSZXRyeUluZm8SOgoLcmV0cnlfZGVsYXkYASABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb25SCnJldHJ5RGVsYXk='); +@$core.Deprecated('Use debugInfoDescriptor instead') const DebugInfo$json = const { '1': 'DebugInfo', '2': const [ @@ -29,6 +36,10 @@ const DebugInfo$json = const { ], }; +/// Descriptor for `DebugInfo`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List debugInfoDescriptor = $convert.base64Decode( + 'CglEZWJ1Z0luZm8SIwoNc3RhY2tfZW50cmllcxgBIAMoCVIMc3RhY2tFbnRyaWVzEhYKBmRldGFpbBgCIAEoCVIGZGV0YWls'); +@$core.Deprecated('Use quotaFailureDescriptor instead') const QuotaFailure$json = const { '1': 'QuotaFailure', '2': const [ @@ -44,6 +55,7 @@ const QuotaFailure$json = const { '3': const [QuotaFailure_Violation$json], }; +@$core.Deprecated('Use quotaFailureDescriptor instead') const QuotaFailure_Violation$json = const { '1': 'Violation', '2': const [ @@ -52,6 +64,10 @@ const QuotaFailure_Violation$json = const { ], }; +/// Descriptor for `QuotaFailure`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List quotaFailureDescriptor = $convert.base64Decode( + 'CgxRdW90YUZhaWx1cmUSQgoKdmlvbGF0aW9ucxgBIAMoCzIiLmdvb2dsZS5ycGMuUXVvdGFGYWlsdXJlLlZpb2xhdGlvblIKdmlvbGF0aW9ucxpHCglWaW9sYXRpb24SGAoHc3ViamVjdBgBIAEoCVIHc3ViamVjdBIgCgtkZXNjcmlwdGlvbhgCIAEoCVILZGVzY3JpcHRpb24='); +@$core.Deprecated('Use errorInfoDescriptor instead') const ErrorInfo$json = const { '1': 'ErrorInfo', '2': const [ @@ -69,6 +85,7 @@ const ErrorInfo$json = const { '3': const [ErrorInfo_MetadataEntry$json], }; +@$core.Deprecated('Use errorInfoDescriptor instead') const ErrorInfo_MetadataEntry$json = const { '1': 'MetadataEntry', '2': const [ @@ -78,6 +95,10 @@ const ErrorInfo_MetadataEntry$json = const { '7': const {'7': true}, }; +/// Descriptor for `ErrorInfo`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List errorInfoDescriptor = $convert.base64Decode( + 'CglFcnJvckluZm8SFgoGcmVhc29uGAEgASgJUgZyZWFzb24SFgoGZG9tYWluGAIgASgJUgZkb21haW4SPwoIbWV0YWRhdGEYAyADKAsyIy5nb29nbGUucnBjLkVycm9ySW5mby5NZXRhZGF0YUVudHJ5UghtZXRhZGF0YRo7Cg1NZXRhZGF0YUVudHJ5EhAKA2tleRgBIAEoCVIDa2V5EhQKBXZhbHVlGAIgASgJUgV2YWx1ZToCOAE='); +@$core.Deprecated('Use preconditionFailureDescriptor instead') const PreconditionFailure$json = const { '1': 'PreconditionFailure', '2': const [ @@ -93,6 +114,7 @@ const PreconditionFailure$json = const { '3': const [PreconditionFailure_Violation$json], }; +@$core.Deprecated('Use preconditionFailureDescriptor instead') const PreconditionFailure_Violation$json = const { '1': 'Violation', '2': const [ @@ -102,6 +124,10 @@ const PreconditionFailure_Violation$json = const { ], }; +/// Descriptor for `PreconditionFailure`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List preconditionFailureDescriptor = $convert.base64Decode( + 'ChNQcmVjb25kaXRpb25GYWlsdXJlEkkKCnZpb2xhdGlvbnMYASADKAsyKS5nb29nbGUucnBjLlByZWNvbmRpdGlvbkZhaWx1cmUuVmlvbGF0aW9uUgp2aW9sYXRpb25zGlsKCVZpb2xhdGlvbhISCgR0eXBlGAEgASgJUgR0eXBlEhgKB3N1YmplY3QYAiABKAlSB3N1YmplY3QSIAoLZGVzY3JpcHRpb24YAyABKAlSC2Rlc2NyaXB0aW9u'); +@$core.Deprecated('Use badRequestDescriptor instead') const BadRequest$json = const { '1': 'BadRequest', '2': const [ @@ -117,6 +143,7 @@ const BadRequest$json = const { '3': const [BadRequest_FieldViolation$json], }; +@$core.Deprecated('Use badRequestDescriptor instead') const BadRequest_FieldViolation$json = const { '1': 'FieldViolation', '2': const [ @@ -125,6 +152,10 @@ const BadRequest_FieldViolation$json = const { ], }; +/// Descriptor for `BadRequest`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List badRequestDescriptor = $convert.base64Decode( + 'CgpCYWRSZXF1ZXN0ElAKEGZpZWxkX3Zpb2xhdGlvbnMYASADKAsyJS5nb29nbGUucnBjLkJhZFJlcXVlc3QuRmllbGRWaW9sYXRpb25SD2ZpZWxkVmlvbGF0aW9ucxpICg5GaWVsZFZpb2xhdGlvbhIUCgVmaWVsZBgBIAEoCVIFZmllbGQSIAoLZGVzY3JpcHRpb24YAiABKAlSC2Rlc2NyaXB0aW9u'); +@$core.Deprecated('Use requestInfoDescriptor instead') const RequestInfo$json = const { '1': 'RequestInfo', '2': const [ @@ -133,6 +164,10 @@ const RequestInfo$json = const { ], }; +/// Descriptor for `RequestInfo`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List requestInfoDescriptor = $convert.base64Decode( + 'CgtSZXF1ZXN0SW5mbxIdCgpyZXF1ZXN0X2lkGAEgASgJUglyZXF1ZXN0SWQSIQoMc2VydmluZ19kYXRhGAIgASgJUgtzZXJ2aW5nRGF0YQ=='); +@$core.Deprecated('Use resourceInfoDescriptor instead') const ResourceInfo$json = const { '1': 'ResourceInfo', '2': const [ @@ -143,6 +178,10 @@ const ResourceInfo$json = const { ], }; +/// Descriptor for `ResourceInfo`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List resourceInfoDescriptor = $convert.base64Decode( + 'CgxSZXNvdXJjZUluZm8SIwoNcmVzb3VyY2VfdHlwZRgBIAEoCVIMcmVzb3VyY2VUeXBlEiMKDXJlc291cmNlX25hbWUYAiABKAlSDHJlc291cmNlTmFtZRIUCgVvd25lchgDIAEoCVIFb3duZXISIAoLZGVzY3JpcHRpb24YBCABKAlSC2Rlc2NyaXB0aW9u'); +@$core.Deprecated('Use helpDescriptor instead') const Help$json = const { '1': 'Help', '2': const [ @@ -158,6 +197,7 @@ const Help$json = const { '3': const [Help_Link$json], }; +@$core.Deprecated('Use helpDescriptor instead') const Help_Link$json = const { '1': 'Link', '2': const [ @@ -166,6 +206,10 @@ const Help_Link$json = const { ], }; +/// Descriptor for `Help`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List helpDescriptor = $convert.base64Decode( + 'CgRIZWxwEisKBWxpbmtzGAEgAygLMhUuZ29vZ2xlLnJwYy5IZWxwLkxpbmtSBWxpbmtzGjoKBExpbmsSIAoLZGVzY3JpcHRpb24YASABKAlSC2Rlc2NyaXB0aW9uEhAKA3VybBgCIAEoCVIDdXJs'); +@$core.Deprecated('Use localizedMessageDescriptor instead') const LocalizedMessage$json = const { '1': 'LocalizedMessage', '2': const [ @@ -173,3 +217,7 @@ const LocalizedMessage$json = const { const {'1': 'message', '3': 2, '4': 1, '5': 9, '10': 'message'}, ], }; + +/// Descriptor for `LocalizedMessage`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List localizedMessageDescriptor = $convert.base64Decode( + 'ChBMb2NhbGl6ZWRNZXNzYWdlEhYKBmxvY2FsZRgBIAEoCVIGbG9jYWxlEhgKB21lc3NhZ2UYAiABKAlSB21lc3NhZ2U='); diff --git a/lib/src/generated/google/rpc/status.pb.dart b/lib/src/generated/google/rpc/status.pb.dart index 718cc9c8..84e13aa5 100644 --- a/lib/src/generated/google/rpc/status.pb.dart +++ b/lib/src/generated/google/rpc/status.pb.dart @@ -3,7 +3,7 @@ // source: google/rpc/status.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; diff --git a/lib/src/generated/google/rpc/status.pbenum.dart b/lib/src/generated/google/rpc/status.pbenum.dart index 290e941f..6ae53627 100644 --- a/lib/src/generated/google/rpc/status.pbenum.dart +++ b/lib/src/generated/google/rpc/status.pbenum.dart @@ -3,4 +3,4 @@ // source: google/rpc/status.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name diff --git a/lib/src/generated/google/rpc/status.pbjson.dart b/lib/src/generated/google/rpc/status.pbjson.dart index a89467dc..27c6cafe 100644 --- a/lib/src/generated/google/rpc/status.pbjson.dart +++ b/lib/src/generated/google/rpc/status.pbjson.dart @@ -3,10 +3,13 @@ // source: google/rpc/status.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; +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 [ @@ -22,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/lib/src/server/handler.dart b/lib/src/server/handler.dart index 6b7cf4ee..052be92d 100644 --- a/lib/src/server/handler.dart +++ b/lib/src/server/handler.dart @@ -30,7 +30,7 @@ import 'interceptor.dart'; import 'service.dart'; /// Handles an incoming gRPC call. -class ServerHandler_ extends ServiceCall { +class ServerHandlerImpl extends ServiceCall { final ServerTransportStream _stream; final Service? Function(String service) _serviceLookup; final List _interceptors; @@ -61,7 +61,7 @@ class ServerHandler_ extends ServiceCall { Timer? _timeoutTimer; final X509Certificate? _clientCertificate; - ServerHandler_(this._serviceLookup, this._stream, this._interceptors, + ServerHandlerImpl(this._serviceLookup, this._stream, this._interceptors, this._codecRegistry, [this._clientCertificate]); @@ -251,7 +251,7 @@ class ServerHandler_ extends ServiceCall { } final data = message; - var request; + Object? request; try { request = _descriptor.deserialize(data.data); } catch (error) { @@ -425,7 +425,8 @@ class ServerHandler_ extends ServiceCall { } } -class ServerHandler extends ServerHandler_ { +class ServerHandler extends ServerHandlerImpl { + // ignore: use_super_parameters ServerHandler(Service Function(String service) serviceLookup, stream, [List interceptors = const [], CodecRegistry? codecRegistry, diff --git a/lib/src/server/server.dart b/lib/src/server/server.dart index b22ac81b..9fbf8712 100644 --- a/lib/src/server/server.dart +++ b/lib/src/server/server.dart @@ -107,7 +107,7 @@ class ConnectionServer { Future serveConnection(ServerTransportConnection connection, [X509Certificate? clientCertificate]) async { _connections.add(connection); - ServerHandler_? handler; + ServerHandlerImpl? handler; // TODO(jakobr): Set active state handlers, close connection after idle // timeout. connection.incomingStreams.listen((stream) { @@ -127,9 +127,9 @@ class ConnectionServer { } @visibleForTesting - ServerHandler_ serveStream_(ServerTransportStream stream, + ServerHandlerImpl serveStream_(ServerTransportStream stream, [X509Certificate? clientCertificate]) { - return ServerHandler_( + return ServerHandlerImpl( lookupService, stream, _interceptors, _codecRegistry, // ignore: unnecessary_cast clientCertificate as io_bits.X509Certificate?, @@ -146,10 +146,10 @@ class Server extends ConnectionServer { /// Create a server for the given [services]. Server( - List services, [ - List interceptors = const [], - CodecRegistry? codecRegistry, - ]) : super(services, interceptors, codecRegistry); + super.services, [ + super.interceptors, + super.codecRegistry, + ]); /// The port that the server is listening on, or `null` if the server is not /// active. @@ -223,9 +223,9 @@ class Server extends ConnectionServer { @override @visibleForTesting - ServerHandler_ serveStream_(ServerTransportStream stream, + ServerHandlerImpl serveStream_(ServerTransportStream stream, [X509Certificate? clientCertificate]) { - return ServerHandler_( + return ServerHandlerImpl( lookupService, stream, _interceptors, diff --git a/lib/src/server/service.dart b/lib/src/server/service.dart index ac5e37a9..7a457c39 100644 --- a/lib/src/server/service.dart +++ b/lib/src/server/service.dart @@ -64,20 +64,20 @@ class ServiceMethod { } Future _toSingleFuture(Stream stream) { - Q _ensureOnlyOneRequest(Q? previous, Q element) { + Q ensureOnlyOneRequest(Q? previous, Q element) { if (previous != null) { throw GrpcError.unimplemented('More than one request received'); } return element; } - Q _ensureOneRequest(Q? value) { + Q ensureOneRequest(Q? value) { if (value == null) throw GrpcError.unimplemented('No requests received'); return value; } final future = - stream.fold(null, _ensureOnlyOneRequest).then(_ensureOneRequest); + stream.fold(null, ensureOnlyOneRequest).then(ensureOneRequest); // Make sure errors on the future aren't unhandled, but return the original // future so the request handler can also get the error. _awaitAndCatch(future); diff --git a/lib/src/shared/status.dart b/lib/src/shared/status.dart index 4e049196..597afce5 100644 --- a/lib/src/shared/status.dart +++ b/lib/src/shared/status.dart @@ -400,7 +400,7 @@ void validateHttpStatusAndContentType( throw GrpcError.custom( status, error?.message ?? - 'HTTP connection completed with ${httpStatus} instead of 200', + 'HTTP connection completed with $httpStatus instead of 200', error?.details, rawResponse, error?.trailers ?? toCustomTrailers(headers), @@ -417,7 +417,7 @@ void validateHttpStatusAndContentType( // Check if content-type header indicates a supported format. if (!_validContentTypePrefix.any(contentType.startsWith)) { throw GrpcError.unknown( - 'unsupported content-type (${contentType})', null, rawResponse); + 'unsupported content-type ($contentType)', null, rawResponse); } } diff --git a/pubspec.yaml b/pubspec.yaml index 17fdb2c0..e85b06b4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,12 +1,12 @@ name: grpc description: Dart implementation of gRPC, a high performance, open-source universal RPC framework. -version: 3.1.0 +version: 3.1.1-dev repository: https://github.com/grpc/grpc-dart environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.17.0 <3.0.0' dependencies: archive: ^3.0.0 @@ -22,6 +22,7 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 build_test: ^2.0.0 + lints: ^2.0.0 mockito: ^5.0.0 path: ^1.8.0 test: ^1.16.0 diff --git a/test/client_certificate_test.dart b/test/client_certificate_test.dart index ddefc465..3652874f 100644 --- a/test/client_certificate_test.dart +++ b/test/client_certificate_test.dart @@ -99,9 +99,9 @@ class SecurityContextChannelCredentials extends ChannelCredentials { final SecurityContext _securityContext; SecurityContextChannelCredentials(SecurityContext securityContext, - {String? authority, BadCertificateHandler? onBadCertificate}) + {super.authority, super.onBadCertificate}) : _securityContext = securityContext, - super.secure(authority: authority, onBadCertificate: onBadCertificate); + super.secure(); @override SecurityContext get securityContext => _securityContext; diff --git a/test/client_handles_bad_connections_test.dart b/test/client_handles_bad_connections_test.dart index b576188b..7b40f435 100644 --- a/test/client_handles_bad_connections_test.dart +++ b/test/client_handles_bad_connections_test.dart @@ -16,7 +16,7 @@ class TestClient extends grpc.Client { (int value) => [value], (List value) => value[0]); - TestClient(ClientChannel channel) : super(channel); + TestClient(super.channel); grpc.ResponseStream stream(int request, {grpc.CallOptions? options}) { return $createStreamingCall(_$stream, Stream.value(request), options: options); diff --git a/test/client_tests/client_interceptor_test.dart b/test/client_tests/client_interceptor_test.dart index b05a9a9b..d9132fbe 100644 --- a/test/client_tests/client_interceptor_test.dart +++ b/test/client_tests/client_interceptor_test.dart @@ -16,7 +16,7 @@ class InterceptorInvocation { @override String toString() { - return '{id: ${id}, unary: ${unary}, streaming: ${streaming}}'; + return '{id: $id, unary: $unary, streaming: $streaming}'; } } diff --git a/test/client_tests/client_xhr_transport_test.dart b/test/client_tests/client_xhr_transport_test.dart index c5ec4234..4b3f8587 100644 --- a/test/client_tests/client_xhr_transport_test.dart +++ b/test/client_tests/client_xhr_transport_test.dart @@ -15,7 +15,6 @@ @TestOn('browser') import 'dart:async'; - import 'dart:html'; import 'package:async/async.dart'; @@ -25,7 +24,6 @@ import 'package:grpc/src/shared/message.dart'; import 'package:grpc/src/shared/status.dart'; import 'package:mockito/mockito.dart'; import 'package:stream_transform/stream_transform.dart'; - import 'package:test/test.dart'; final readyStateChangeEvent = @@ -374,7 +372,7 @@ void main() { when(connection.latestRequest.responseText).thenReturn(errorDetails); connection.latestRequest.readyStateChangeController .add(readyStateChangeEvent); - await errorReceived; + await errorReceived.future; expect(errors.single.rawResponse, errorDetails); }); diff --git a/test/common.dart b/test/common.dart index bc7ba71a..c685761d 100644 --- a/test/common.dart +++ b/test/common.dart @@ -24,7 +24,7 @@ void testUds(String name, FutureOr Function(InternetAddress) testCase) { test(name, () async { final tempDir = await Directory.systemTemp.createTemp(); - final address = InternetAddress(tempDir.path + '/socket', + final address = InternetAddress('${tempDir.path}/socket', type: InternetAddressType.unix); addTearDown(() => tempDir.delete(recursive: true)); await testCase(address); diff --git a/test/connection_server_test.dart b/test/connection_server_test.dart index 83817eb2..16969c15 100644 --- a/test/connection_server_test.dart +++ b/test/connection_server_test.dart @@ -288,12 +288,12 @@ void main() { return expectedResponse; } - final Interceptor interceptor = (call, method) { + GrpcError? interceptor(call, method) { if (method.name == 'Unary') { return null; } return GrpcError.unauthenticated('Request is unauthenticated'); - }; + } Future doTest(Interceptor handler) async { harness @@ -310,12 +310,12 @@ void main() { }); group('returns error if interceptor blocks request', () { - final Interceptor interceptor = (call, method) { + GrpcError? interceptor(call, method) { if (method.name == 'Unary') { return GrpcError.unauthenticated('Request is unauthenticated'); } return null; - }; + } Future doTest(Interceptor handler) async { harness @@ -333,9 +333,9 @@ void main() { }); group('returns internal error if interceptor throws exception', () { - final Interceptor interceptor = (call, method) { + FutureOr interceptor(call, method) { throw Exception('Reason is unknown'); - }; + } Future doTest(Interceptor handler) async { harness @@ -353,11 +353,11 @@ void main() { }); test("don't fail if interceptor await 2 times", () async { - final Interceptor interceptor = (call, method) async { + FutureOr interceptor(call, method) async { await Future.value(); await Future.value(); throw Exception('Reason is unknown'); - }; + } harness ..interceptor.handler = interceptor diff --git a/test/grpc_web_server.dart b/test/grpc_web_server.dart index 15e0656d..d9354887 100644 --- a/test/grpc_web_server.dart +++ b/test/grpc_web_server.dart @@ -152,12 +152,12 @@ if you are running tests locally. }); proxy.exitCode.then((value) { - _info('proxy quit with ${value}'); + _info('proxy quit with $value'); if (value != 0) { if (!verbose) { stdout.writeAll(output, '\n'); } - channel.sink.addError('proxy exited with ${value}'); + channel.sink.addError('proxy exited with $value'); } }); diff --git a/test/grpc_web_test.dart b/test/grpc_web_test.dart index 16bdd540..ad58181b 100644 --- a/test/grpc_web_test.dart +++ b/test/grpc_web_test.dart @@ -193,7 +193,7 @@ class GrpcWebServer { return GrpcWebServer( serverChannel, exitCompleter.future, - Uri.parse('http://localhost:${grpcPort}'), - Uri.parse('http://localhost:${httpPort}')); + Uri.parse('http://localhost:$grpcPort'), + Uri.parse('http://localhost:$httpPort')); } } diff --git a/test/round_trip_test.dart b/test/round_trip_test.dart index 90837a85..12d34b25 100644 --- a/test/round_trip_test.dart +++ b/test/round_trip_test.dart @@ -3,7 +3,6 @@ import 'dart:async'; import 'dart:io'; import 'package:grpc/grpc.dart'; -import 'package:grpc/service_api.dart' as api; import 'package:grpc/src/client/channel.dart' hide ClientChannel; import 'package:grpc/src/client/connection.dart'; import 'package:grpc/src/client/http2_connection.dart'; @@ -15,7 +14,7 @@ class TestClient extends Client { static final _$stream = ClientMethod('/test.TestService/stream', (int value) => [value], (List value) => value[0]); - TestClient(api.ClientChannel channel) : super(channel); + TestClient(super.channel); ResponseStream stream(int request, {CallOptions? options}) { return $createStreamingCall(_$stream, Stream.value(request), options: options); diff --git a/test/server_handles_broken_connection_test.dart b/test/server_handles_broken_connection_test.dart index b8a934c5..799c0908 100644 --- a/test/server_handles_broken_connection_test.dart +++ b/test/server_handles_broken_connection_test.dart @@ -12,7 +12,7 @@ class TestClient extends grpc.Client { (int value) => [value], (List value) => value[0]); - TestClient(grpc.ClientChannel channel) : super(channel); + TestClient(grpc.ClientChannel super.channel); grpc.ResponseStream infiniteStream(int request, {grpc.CallOptions? options}) { return $createStreamingCall(_$infiniteStream, Stream.value(request), diff --git a/test/server_test.dart b/test/server_test.dart index 36b3bc53..63a957c0 100644 --- a/test/server_test.dart +++ b/test/server_test.dart @@ -302,12 +302,12 @@ void main() { return expectedResponse; } - final Interceptor interceptor = (call, method) { + GrpcError? interceptor(call, method) { if (method.name == 'Unary') { return null; } return GrpcError.unauthenticated('Request is unauthenticated'); - }; + } Future doTest(Interceptor handler) async { harness @@ -324,12 +324,12 @@ void main() { }); group('returns error if interceptor blocks request', () { - final Interceptor interceptor = (call, method) { + GrpcError? interceptor(call, method) { if (method.name == 'Unary') { return GrpcError.unauthenticated('Request is unauthenticated'); } return null; - }; + } Future doTest(Interceptor handler) async { harness @@ -347,9 +347,9 @@ void main() { }); group('returns internal error if interceptor throws exception', () { - final Interceptor interceptor = (call, method) { + FutureOr interceptor(call, method) { throw Exception('Reason is unknown'); - }; + } Future doTest(Interceptor handler) async { harness @@ -367,11 +367,11 @@ void main() { }); test("don't fail if interceptor await 2 times", () async { - final Interceptor interceptor = (call, method) async { + FutureOr interceptor(call, method) async { await Future.value(); await Future.value(); throw Exception('Reason is unknown'); - }; + } harness ..interceptor.handler = interceptor diff --git a/test/src/client_utils.dart b/test/src/client_utils.dart index fd231738..6791e7f6 100644 --- a/test/src/client_utils.dart +++ b/test/src/client_utils.dart @@ -32,14 +32,14 @@ import 'utils.dart'; class FakeConnection extends Http2ClientConnection { final ClientTransportConnection transport; - var connectionError; + Object? connectionError; FakeConnection(String host, this.transport, ChannelOptions options) : super(host, 443, options); @override Future connectTransport() async { - if (connectionError != null) throw connectionError; + if (connectionError != null) throw connectionError!; return transport; } } @@ -47,14 +47,14 @@ class FakeConnection extends Http2ClientConnection { class FakeClientTransportConnection extends Http2ClientConnection { final ClientTransportConnector connector; - var connectionError; + Object? connectionError; FakeClientTransportConnection(this.connector, ChannelOptions options) : super.fromClientTransportConnector(connector, options); @override Future connectTransport() async { - if (connectionError != null) throw connectionError; + if (connectionError != null) throw connectionError!; return await connector.connect(); } } @@ -78,11 +78,12 @@ class FakeChannelOptions implements ChannelOptions { class FakeChannel extends ClientChannel { final Http2ClientConnection connection; + @override - final FakeChannelOptions options; + FakeChannelOptions get options => super.options as FakeChannelOptions; - FakeChannel(String host, this.connection, this.options) - : super(host, options: options); + FakeChannel(String super.host, this.connection, FakeChannelOptions options) + : super(options: options); @override Future getConnection() async => connection; @@ -90,12 +91,13 @@ class FakeChannel extends ClientChannel { class FakeClientConnectorChannel extends ClientTransportConnectorChannel { final Http2ClientConnection connection; + @override - final FakeChannelOptions options; + FakeChannelOptions get options => super.options as FakeChannelOptions; FakeClientConnectorChannel( - ClientTransportConnector connector, this.connection, this.options) - : super(connector, options: options); + super.connector, this.connection, FakeChannelOptions options) + : super(options: options); @override Future getConnection() async => connection; @@ -111,11 +113,8 @@ class TestClient extends Client { final int Function(List value) decode; - TestClient(base.ClientChannel channel, - {CallOptions? options, - Iterable? interceptors, - this.decode = mockDecode}) - : super(channel, options: options, interceptors: interceptors) { + TestClient(super.channel, + {super.options, super.interceptors, this.decode = mockDecode}) { _$unary = ClientMethod('/Test/Unary', mockEncode, decode); _$clientStreaming = ClientMethod('/Test/ClientStreaming', mockEncode, decode); diff --git a/test/src/client_utils.mocks.dart b/test/src/client_utils.mocks.dart index cb979aa7..9d39b58d 100644 --- a/test/src/client_utils.mocks.dart +++ b/test/src/client_utils.mocks.dart @@ -2,27 +2,27 @@ // in grpc/test/src/client_utils.dart. // Do not manually edit this file. -import 'dart:async' as _i3; +import 'dart:async' as i3; -import 'package:http2/src/hpack/hpack.dart' as _i4; -import 'package:http2/transport.dart' as _i2; -import 'package:mockito/mockito.dart' as _i1; +import 'package:http2/src/hpack/hpack.dart' as i4; +import 'package:http2/transport.dart' as i2; +import 'package:mockito/mockito.dart' as i1; // ignore_for_file: comment_references // ignore_for_file: unnecessary_parenthesis -class _FakeClientTransportStream extends _i1.Fake - implements _i2.ClientTransportStream {} +class _FakeClientTransportStream extends i1.Fake + implements i2.ClientTransportStream {} -class _FakeStreamSink extends _i1.Fake implements _i3.StreamSink {} +class _FakeStreamSink extends i1.Fake implements i3.StreamSink {} /// A class which mocks [ClientTransportConnection]. /// /// See the documentation for Mockito's code generation for more information. -class MockClientTransportConnection extends _i1.Mock - implements _i2.ClientTransportConnection { +class MockClientTransportConnection extends i1.Mock + implements i2.ClientTransportConnection { MockClientTransportConnection() { - _i1.throwOnMissingStub(this); + i1.throwOnMissingStub(this); } @override @@ -30,67 +30,66 @@ class MockClientTransportConnection extends _i1.Mock (super.noSuchMethod(Invocation.getter(#isOpen), returnValue: false) as bool); @override - set onActiveStateChanged(_i2.ActiveStateHandler? callback) => + set onActiveStateChanged(i2.ActiveStateHandler? callback) => super.noSuchMethod(Invocation.setter(#onActiveStateChanged, callback), returnValueForMissingStub: null); @override - _i3.Future get onInitialPeerSettingsReceived => + i3.Future get onInitialPeerSettingsReceived => (super.noSuchMethod(Invocation.getter(#onInitialPeerSettingsReceived), - returnValue: Future.value(null)) as _i3.Future); + returnValue: Future.value(null)) as i3.Future); @override - _i2.ClientTransportStream makeRequest(List<_i4.Header>? headers, + i2.ClientTransportStream makeRequest(List? headers, {bool? endStream = false}) => (super.noSuchMethod( Invocation.method(#makeRequest, [headers], {#endStream: endStream}), returnValue: - _FakeClientTransportStream()) as _i2.ClientTransportStream); + _FakeClientTransportStream()) as i2.ClientTransportStream); @override - _i3.Future ping() => - (super.noSuchMethod(Invocation.method(#ping, []), - returnValue: Future.value(null)) as _i3.Future); + i3.Future ping() => (super.noSuchMethod(Invocation.method(#ping, []), + returnValue: Future.value(null)) as i3.Future); @override - _i3.Future finish() => + i3.Future finish() => (super.noSuchMethod(Invocation.method(#finish, []), - returnValue: Future.value(null)) as _i3.Future); + returnValue: Future.value(null)) as i3.Future); @override - _i3.Future terminate() => + i3.Future terminate() => (super.noSuchMethod(Invocation.method(#terminate, []), - returnValue: Future.value(null)) as _i3.Future); + returnValue: Future.value(null)) as i3.Future); } /// A class which mocks [ClientTransportStream]. /// /// See the documentation for Mockito's code generation for more information. -class MockClientTransportStream extends _i1.Mock - implements _i2.ClientTransportStream { +class MockClientTransportStream extends i1.Mock + implements i2.ClientTransportStream { MockClientTransportStream() { - _i1.throwOnMissingStub(this); + i1.throwOnMissingStub(this); } @override - _i3.Stream<_i2.TransportStreamPush> get peerPushes => + i3.Stream get peerPushes => (super.noSuchMethod(Invocation.getter(#peerPushes), - returnValue: Stream<_i2.TransportStreamPush>.empty()) - as _i3.Stream<_i2.TransportStreamPush>); + returnValue: Stream.empty()) + as i3.Stream); @override int get id => (super.noSuchMethod(Invocation.getter(#id), returnValue: 0) as int); @override - _i3.Stream<_i2.StreamMessage> get incomingMessages => + i3.Stream get incomingMessages => (super.noSuchMethod(Invocation.getter(#incomingMessages), - returnValue: Stream<_i2.StreamMessage>.empty()) - as _i3.Stream<_i2.StreamMessage>); + returnValue: Stream.empty()) + as i3.Stream); @override - _i3.StreamSink<_i2.StreamMessage> get outgoingMessages => + i3.StreamSink get outgoingMessages => (super.noSuchMethod(Invocation.getter(#outgoingMessages), - returnValue: _FakeStreamSink<_i2.StreamMessage>()) - as _i3.StreamSink<_i2.StreamMessage>); + returnValue: _FakeStreamSink()) + as i3.StreamSink); @override set onTerminated(void Function(int?)? value) => super.noSuchMethod(Invocation.setter(#onTerminated, value), returnValueForMissingStub: null); @override - void sendHeaders(List<_i4.Header>? headers, {bool? endStream = false}) => + void sendHeaders(List? headers, {bool? endStream = false}) => super.noSuchMethod( Invocation.method(#sendHeaders, [headers], {#endStream: endStream}), returnValueForMissingStub: null); diff --git a/test/src/generated/echo.pb.dart b/test/src/generated/echo.pb.dart index 4f2165db..44512dac 100644 --- a/test/src/generated/echo.pb.dart +++ b/test/src/generated/echo.pb.dart @@ -3,7 +3,7 @@ // source: echo.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; diff --git a/test/src/generated/echo.pbenum.dart b/test/src/generated/echo.pbenum.dart index 01eb863f..dae04226 100644 --- a/test/src/generated/echo.pbenum.dart +++ b/test/src/generated/echo.pbenum.dart @@ -3,4 +3,4 @@ // source: echo.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name diff --git a/test/src/generated/echo.pbgrpc.dart b/test/src/generated/echo.pbgrpc.dart index 71d4f328..e5c093ea 100644 --- a/test/src/generated/echo.pbgrpc.dart +++ b/test/src/generated/echo.pbgrpc.dart @@ -2,8 +2,8 @@ // Generated code. Do not modify. // source: echo.proto // - -// 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,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:async' as $async; diff --git a/test/src/generated/echo.pbjson.dart b/test/src/generated/echo.pbjson.dart index d0ba2597..d1adba55 100644 --- a/test/src/generated/echo.pbjson.dart +++ b/test/src/generated/echo.pbjson.dart @@ -3,10 +3,13 @@ // source: echo.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 +// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name import 'dart:core' as $core; +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 [ @@ -14,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 [ @@ -21,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 [ @@ -36,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/test/timeline_test.dart b/test/timeline_test.dart index 94172a8a..f90681d1 100644 --- a/test/timeline_test.dart +++ b/test/timeline_test.dart @@ -18,7 +18,6 @@ import 'dart:async'; import 'dart:developer'; import 'package:grpc/grpc.dart'; -import 'package:grpc/service_api.dart' as api; import 'package:grpc/src/client/channel.dart' hide ClientChannel; import 'package:grpc/src/client/connection.dart'; import 'package:grpc/src/client/http2_connection.dart'; @@ -32,7 +31,7 @@ class TestClient extends Client { static final _$stream = ClientMethod( path, (int value) => [value], (List value) => value[0]); - TestClient(api.ClientChannel channel) : super(channel); + TestClient(super.channel); ResponseStream stream(int request, {CallOptions? options}) { return $createStreamingCall(_$stream, Stream.fromIterable([request]), options: options); diff --git a/tool/regenerate.sh b/tool/regenerate.sh index 51b4e5ff..36cb4df9 100755 --- a/tool/regenerate.sh +++ b/tool/regenerate.sh @@ -21,4 +21,4 @@ for dir in interop example/*/; do dart format lib/src/generated fi popd -done \ No newline at end of file +done