Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate examples to Dart null safety #536

Merged
merged 3 commits into from Jan 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions example/googleapis/README.md
Expand Up @@ -19,13 +19,13 @@ To run the example, assuming you are in the root of the googleapis folder, i.e.,
.../example/googleapis/, first get the dependencies by running:

```sh
$ pub get
$ dart pub get
```

Then, to run the logging client sample:

```sh
$ pub run googleapis:logging
$ dart run bin/logging.dart
```

# Regenerate the stubs
Expand Down
14 changes: 7 additions & 7 deletions example/googleapis/lib/src/generated/google/api/label.pb.dart
Expand Up @@ -2,7 +2,7 @@
// Generated code. Do not modify.
// source: google/api/label.proto
//
// @dart = 2.7
// @dart = 2.12
// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields

import 'dart:core' as $core;
Expand Down Expand Up @@ -46,9 +46,9 @@ class LabelDescriptor extends $pb.GeneratedMessage {

LabelDescriptor._() : super();
factory LabelDescriptor({
$core.String key,
LabelDescriptor_ValueType valueType,
$core.String description,
$core.String? key,
LabelDescriptor_ValueType? valueType,
$core.String? description,
}) {
final _result = create();
if (key != null) {
Expand Down Expand Up @@ -76,8 +76,8 @@ class LabelDescriptor extends $pb.GeneratedMessage {
'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
'Will be removed in next major version')
LabelDescriptor copyWith(void Function(LabelDescriptor) updates) =>
super.copyWith((message) =>
updates(message as LabelDescriptor)); // ignore: deprecated_member_use
super.copyWith((message) => updates(message as LabelDescriptor))
as LabelDescriptor; // ignore: deprecated_member_use
$pb.BuilderInfo get info_ => _i;
@$core.pragma('dart2js:noInline')
static LabelDescriptor create() => LabelDescriptor._();
Expand All @@ -87,7 +87,7 @@ class LabelDescriptor extends $pb.GeneratedMessage {
@$core.pragma('dart2js:noInline')
static LabelDescriptor getDefault() => _defaultInstance ??=
$pb.GeneratedMessage.$_defaultFor<LabelDescriptor>(create);
static LabelDescriptor _defaultInstance;
static LabelDescriptor? _defaultInstance;

@$pb.TagNumber(1)
$core.String get key => $_getSZ(0);
Expand Down
Expand Up @@ -2,7 +2,7 @@
// Generated code. Do not modify.
// source: google/api/label.proto
//
// @dart = 2.7
// @dart = 2.12
// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields

// ignore_for_file: UNDEFINED_SHOWN_NAME
Expand Down Expand Up @@ -35,7 +35,7 @@ class LabelDescriptor_ValueType extends $pb.ProtobufEnum {

static final $core.Map<$core.int, LabelDescriptor_ValueType> _byValue =
$pb.ProtobufEnum.initByValue(values);
static LabelDescriptor_ValueType valueOf($core.int value) => _byValue[value];
static LabelDescriptor_ValueType? valueOf($core.int value) => _byValue[value];

const LabelDescriptor_ValueType._($core.int v, $core.String n) : super(v, n);
}
14 changes: 12 additions & 2 deletions example/googleapis/lib/src/generated/google/api/label.pbjson.dart
Expand Up @@ -2,9 +2,14 @@
// Generated code. Do not modify.
// source: google/api/label.proto
//
// @dart = 2.7
// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields
// @dart = 2.12
// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package

import 'dart:core' as $core;
import 'dart:convert' as $convert;
import 'dart:typed_data' as $typed_data;

@$core.Deprecated('Use labelDescriptorDescriptor instead')
const LabelDescriptor$json = const {
'1': 'LabelDescriptor',
'2': const [
Expand All @@ -22,6 +27,7 @@ const LabelDescriptor$json = const {
'4': const [LabelDescriptor_ValueType$json],
};

@$core.Deprecated('Use labelDescriptorDescriptor instead')
const LabelDescriptor_ValueType$json = const {
'1': 'ValueType',
'2': const [
Expand All @@ -30,3 +36,7 @@ const LabelDescriptor_ValueType$json = const {
const {'1': 'INT64', '2': 2},
],
};

/// Descriptor for `LabelDescriptor`. Decode as a `google.protobuf.DescriptorProto`.
final $typed_data.Uint8List labelDescriptorDescriptor = $convert.base64Decode(
'Cg9MYWJlbERlc2NyaXB0b3ISEAoDa2V5GAEgASgJUgNrZXkSRAoKdmFsdWVfdHlwZRgCIAEoDjIlLmdvb2dsZS5hcGkuTGFiZWxEZXNjcmlwdG9yLlZhbHVlVHlwZVIJdmFsdWVUeXBlEiAKC2Rlc2NyaXB0aW9uGAMgASgJUgtkZXNjcmlwdGlvbiIsCglWYWx1ZVR5cGUSCgoGU1RSSU5HEAASCAoEQk9PTBABEgkKBUlOVDY0EAI=');
Expand Up @@ -2,7 +2,7 @@
// Generated code. Do not modify.
// source: google/api/launch_stage.proto
//
// @dart = 2.7
// @dart = 2.12
// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields

import 'dart:core' as $core;
Expand Down
Expand Up @@ -2,7 +2,7 @@
// Generated code. Do not modify.
// source: google/api/launch_stage.proto
//
// @dart = 2.7
// @dart = 2.12
// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields

// ignore_for_file: UNDEFINED_SHOWN_NAME
Expand Down Expand Up @@ -61,7 +61,7 @@ class LaunchStage extends $pb.ProtobufEnum {

static final $core.Map<$core.int, LaunchStage> _byValue =
$pb.ProtobufEnum.initByValue(values);
static LaunchStage valueOf($core.int value) => _byValue[value];
static LaunchStage? valueOf($core.int value) => _byValue[value];

const LaunchStage._($core.int v, $core.String n) : super(v, n);
}
Expand Up @@ -2,9 +2,14 @@
// Generated code. Do not modify.
// source: google/api/launch_stage.proto
//
// @dart = 2.7
// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields
// @dart = 2.12
// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package

import 'dart:core' as $core;
import 'dart:convert' as $convert;
import 'dart:typed_data' as $typed_data;

@$core.Deprecated('Use launchStageDescriptor instead')
const LaunchStage$json = const {
'1': 'LaunchStage',
'2': const [
Expand All @@ -18,3 +23,7 @@ const LaunchStage$json = const {
const {'1': 'DEPRECATED', '2': 5},
],
};

/// Descriptor for `LaunchStage`. Decode as a `google.protobuf.EnumDescriptorProto`.
final $typed_data.Uint8List launchStageDescriptor = $convert.base64Decode(
'CgtMYXVuY2hTdGFnZRIcChhMQVVOQ0hfU1RBR0VfVU5TUEVDSUZJRUQQABIRCg1VTklNUExFTUVOVEVEEAYSDQoJUFJFTEFVTkNIEAcSEAoMRUFSTFlfQUNDRVNTEAESCQoFQUxQSEEQAhIICgRCRVRBEAMSBgoCR0EQBBIOCgpERVBSRUNBVEVEEAU=');
Expand Up @@ -2,7 +2,7 @@
// Generated code. Do not modify.
// source: google/api/monitored_resource.proto
//
// @dart = 2.7
// @dart = 2.12
// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields

import 'dart:core' as $core;
Expand Down Expand Up @@ -64,12 +64,12 @@ class MonitoredResourceDescriptor extends $pb.GeneratedMessage {

MonitoredResourceDescriptor._() : super();
factory MonitoredResourceDescriptor({
$core.String type,
$core.String displayName,
$core.String description,
$core.Iterable<$0.LabelDescriptor> labels,
$core.String name,
$2.LaunchStage launchStage,
$core.String? type,
$core.String? displayName,
$core.String? description,
$core.Iterable<$0.LabelDescriptor>? labels,
$core.String? name,
$2.LaunchStage? launchStage,
}) {
final _result = create();
if (type != null) {
Expand Down Expand Up @@ -108,8 +108,9 @@ class MonitoredResourceDescriptor extends $pb.GeneratedMessage {
'Will be removed in next major version')
MonitoredResourceDescriptor copyWith(
void Function(MonitoredResourceDescriptor) updates) =>
super.copyWith((message) => updates(message
as MonitoredResourceDescriptor)); // ignore: deprecated_member_use
super.copyWith(
(message) => updates(message as MonitoredResourceDescriptor))
as MonitoredResourceDescriptor; // ignore: deprecated_member_use
$pb.BuilderInfo get info_ => _i;
@$core.pragma('dart2js:noInline')
static MonitoredResourceDescriptor create() =>
Expand All @@ -120,7 +121,7 @@ class MonitoredResourceDescriptor extends $pb.GeneratedMessage {
@$core.pragma('dart2js:noInline')
static MonitoredResourceDescriptor getDefault() => _defaultInstance ??=
$pb.GeneratedMessage.$_defaultFor<MonitoredResourceDescriptor>(create);
static MonitoredResourceDescriptor _defaultInstance;
static MonitoredResourceDescriptor? _defaultInstance;

@$pb.TagNumber(1)
$core.String get type => $_getSZ(0);
Expand Down Expand Up @@ -214,8 +215,8 @@ class MonitoredResource extends $pb.GeneratedMessage {

MonitoredResource._() : super();
factory MonitoredResource({
$core.String type,
$core.Map<$core.String, $core.String> labels,
$core.String? type,
$core.Map<$core.String, $core.String>? labels,
}) {
final _result = create();
if (type != null) {
Expand All @@ -240,8 +241,8 @@ class MonitoredResource extends $pb.GeneratedMessage {
'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
'Will be removed in next major version')
MonitoredResource copyWith(void Function(MonitoredResource) updates) =>
super.copyWith((message) => updates(
message as MonitoredResource)); // ignore: deprecated_member_use
super.copyWith((message) => updates(message as MonitoredResource))
as MonitoredResource; // ignore: deprecated_member_use
$pb.BuilderInfo get info_ => _i;
@$core.pragma('dart2js:noInline')
static MonitoredResource create() => MonitoredResource._();
Expand All @@ -251,7 +252,7 @@ class MonitoredResource extends $pb.GeneratedMessage {
@$core.pragma('dart2js:noInline')
static MonitoredResource getDefault() => _defaultInstance ??=
$pb.GeneratedMessage.$_defaultFor<MonitoredResource>(create);
static MonitoredResource _defaultInstance;
static MonitoredResource? _defaultInstance;

@$pb.TagNumber(1)
$core.String get type => $_getSZ(0);
Expand Down Expand Up @@ -298,8 +299,8 @@ class MonitoredResourceMetadata extends $pb.GeneratedMessage {

MonitoredResourceMetadata._() : super();
factory MonitoredResourceMetadata({
$1.Struct systemLabels,
$core.Map<$core.String, $core.String> userLabels,
$1.Struct? systemLabels,
$core.Map<$core.String, $core.String>? userLabels,
}) {
final _result = create();
if (systemLabels != null) {
Expand All @@ -326,8 +327,8 @@ class MonitoredResourceMetadata extends $pb.GeneratedMessage {
'Will be removed in next major version')
MonitoredResourceMetadata copyWith(
void Function(MonitoredResourceMetadata) updates) =>
super.copyWith((message) => updates(message
as MonitoredResourceMetadata)); // ignore: deprecated_member_use
super.copyWith((message) => updates(message as MonitoredResourceMetadata))
as MonitoredResourceMetadata; // ignore: deprecated_member_use
$pb.BuilderInfo get info_ => _i;
@$core.pragma('dart2js:noInline')
static MonitoredResourceMetadata create() => MonitoredResourceMetadata._();
Expand All @@ -337,7 +338,7 @@ class MonitoredResourceMetadata extends $pb.GeneratedMessage {
@$core.pragma('dart2js:noInline')
static MonitoredResourceMetadata getDefault() => _defaultInstance ??=
$pb.GeneratedMessage.$_defaultFor<MonitoredResourceMetadata>(create);
static MonitoredResourceMetadata _defaultInstance;
static MonitoredResourceMetadata? _defaultInstance;

@$pb.TagNumber(1)
$1.Struct get systemLabels => $_getN(0);
Expand Down
Expand Up @@ -2,5 +2,5 @@
// Generated code. Do not modify.
// source: google/api/monitored_resource.proto
//
// @dart = 2.7
// @dart = 2.12
// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields
Expand Up @@ -2,9 +2,14 @@
// Generated code. Do not modify.
// source: google/api/monitored_resource.proto
//
// @dart = 2.7
// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields
// @dart = 2.12
// ignore_for_file: annotate_overrides,camel_case_types,unnecessary_const,non_constant_identifier_names,library_prefixes,unused_import,unused_shown_name,return_of_invalid_type,unnecessary_this,prefer_final_fields,deprecated_member_use_from_same_package

import 'dart:core' as $core;
import 'dart:convert' as $convert;
import 'dart:typed_data' as $typed_data;

@$core.Deprecated('Use monitoredResourceDescriptorDescriptor instead')
const MonitoredResourceDescriptor$json = const {
'1': 'MonitoredResourceDescriptor',
'2': const [
Expand All @@ -31,6 +36,11 @@ const MonitoredResourceDescriptor$json = const {
],
};

/// Descriptor for `MonitoredResourceDescriptor`. Decode as a `google.protobuf.DescriptorProto`.
final $typed_data.Uint8List monitoredResourceDescriptorDescriptor =
$convert.base64Decode(
'ChtNb25pdG9yZWRSZXNvdXJjZURlc2NyaXB0b3ISEgoEbmFtZRgFIAEoCVIEbmFtZRISCgR0eXBlGAEgASgJUgR0eXBlEiEKDGRpc3BsYXlfbmFtZRgCIAEoCVILZGlzcGxheU5hbWUSIAoLZGVzY3JpcHRpb24YAyABKAlSC2Rlc2NyaXB0aW9uEjMKBmxhYmVscxgEIAMoCzIbLmdvb2dsZS5hcGkuTGFiZWxEZXNjcmlwdG9yUgZsYWJlbHMSOgoMbGF1bmNoX3N0YWdlGAcgASgOMhcuZ29vZ2xlLmFwaS5MYXVuY2hTdGFnZVILbGF1bmNoU3RhZ2U=');
@$core.Deprecated('Use monitoredResourceDescriptor instead')
const MonitoredResource$json = const {
'1': 'MonitoredResource',
'2': const [
Expand All @@ -47,6 +57,7 @@ const MonitoredResource$json = const {
'3': const [MonitoredResource_LabelsEntry$json],
};

@$core.Deprecated('Use monitoredResourceDescriptor instead')
const MonitoredResource_LabelsEntry$json = const {
'1': 'LabelsEntry',
'2': const [
Expand All @@ -56,6 +67,10 @@ const MonitoredResource_LabelsEntry$json = const {
'7': const {'7': true},
};

/// Descriptor for `MonitoredResource`. Decode as a `google.protobuf.DescriptorProto`.
final $typed_data.Uint8List monitoredResourceDescriptor = $convert.base64Decode(
'ChFNb25pdG9yZWRSZXNvdXJjZRISCgR0eXBlGAEgASgJUgR0eXBlEkEKBmxhYmVscxgCIAMoCzIpLmdvb2dsZS5hcGkuTW9uaXRvcmVkUmVzb3VyY2UuTGFiZWxzRW50cnlSBmxhYmVscxo5CgtMYWJlbHNFbnRyeRIQCgNrZXkYASABKAlSA2tleRIUCgV2YWx1ZRgCIAEoCVIFdmFsdWU6AjgB');
@$core.Deprecated('Use monitoredResourceMetadataDescriptor instead')
const MonitoredResourceMetadata$json = const {
'1': 'MonitoredResourceMetadata',
'2': const [
Expand All @@ -79,6 +94,7 @@ const MonitoredResourceMetadata$json = const {
'3': const [MonitoredResourceMetadata_UserLabelsEntry$json],
};

@$core.Deprecated('Use monitoredResourceMetadataDescriptor instead')
const MonitoredResourceMetadata_UserLabelsEntry$json = const {
'1': 'UserLabelsEntry',
'2': const [
Expand All @@ -87,3 +103,8 @@ const MonitoredResourceMetadata_UserLabelsEntry$json = const {
],
'7': const {'7': true},
};

/// Descriptor for `MonitoredResourceMetadata`. Decode as a `google.protobuf.DescriptorProto`.
final $typed_data.Uint8List monitoredResourceMetadataDescriptor =
$convert.base64Decode(
'ChlNb25pdG9yZWRSZXNvdXJjZU1ldGFkYXRhEjwKDXN5c3RlbV9sYWJlbHMYASABKAsyFy5nb29nbGUucHJvdG9idWYuU3RydWN0UgxzeXN0ZW1MYWJlbHMSVgoLdXNlcl9sYWJlbHMYAiADKAsyNS5nb29nbGUuYXBpLk1vbml0b3JlZFJlc291cmNlTWV0YWRhdGEuVXNlckxhYmVsc0VudHJ5Ugp1c2VyTGFiZWxzGj0KD1VzZXJMYWJlbHNFbnRyeRIQCgNrZXkYASABKAlSA2tleRIUCgV2YWx1ZRgCIAEoCVIFdmFsdWU6AjgB');