diff --git a/actions/pubspec.yaml b/actions/pubspec.yaml index c33014a2c97..903b1af1b77 100644 --- a/actions/pubspec.yaml +++ b/actions/pubspec.yaml @@ -21,10 +21,10 @@ dependencies: dev_dependencies: amplify_lints: ^3.0.0 - build_runner: ^2.4.9 + build_runner: ^2.4.15 build_test: ^3.1.1 checks: ^0.3.0 - json_serializable: ">=6.9.4 <6.10.0" + json_serializable: ^6.11.0 test: ^1.22.1 aft: diff --git a/packages/aft/pubspec.yaml b/packages/aft/pubspec.yaml index 92b3d6d333c..095270f38a2 100644 --- a/packages/aft/pubspec.yaml +++ b/packages/aft/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: args: ^2.5.0 async: ^2.10.0 aws_common: ">=0.4.2+5 <0.5.0" - built_collection: ^5.0.0 + built_collection: ^5.1.1 built_value: ^8.10.1 checked_yaml: ^2.0.0 cli_util: ^0.4.2 @@ -65,10 +65,10 @@ dependency_overrides: dev_dependencies: amplify_lints: ^3.1.0 - build_runner: ^2.4.9 + build_runner: ^2.4.15 built_value_generator: ^8.10.1 checks: ^0.3.0 - json_serializable: ">=6.9.4 <6.10.0" + json_serializable: ^6.11.0 test: ^1.22.1 test_descriptor: ^2.0.1 diff --git a/packages/amplify/amplify_flutter/pubspec.yaml b/packages/amplify/amplify_flutter/pubspec.yaml index 03ee00130eb..f8dd68ba426 100644 --- a/packages/amplify/amplify_flutter/pubspec.yaml +++ b/packages/amplify/amplify_flutter/pubspec.yaml @@ -31,7 +31,7 @@ dev_dependencies: amplify_lints: ">=3.1.4 <3.2.0" amplify_test: path: ../../test/amplify_test - build_runner: ^2.4.9 + build_runner: ^2.4.15 flutter_test: sdk: flutter - json_serializable: ">=6.9.4 <6.10.0" + json_serializable: ^6.11.0 diff --git a/packages/amplify_core/doc/pubspec.yaml b/packages/amplify_core/doc/pubspec.yaml index fea01260bc5..3dd22b9ec15 100644 --- a/packages/amplify_core/doc/pubspec.yaml +++ b/packages/amplify_core/doc/pubspec.yaml @@ -22,7 +22,7 @@ dependencies: dev_dependencies: amplify_lints: ^3.1.0 - build_runner: ^2.4.9 + build_runner: ^2.4.15 code_excerpter: git: url: https://github.com/dart-lang/site-shared diff --git a/packages/amplify_core/pubspec.yaml b/packages/amplify_core/pubspec.yaml index 35f9ac54261..c2e216b0b5a 100644 --- a/packages/amplify_core/pubspec.yaml +++ b/packages/amplify_core/pubspec.yaml @@ -25,16 +25,16 @@ dependencies: dev_dependencies: amplify_lints: ">=3.1.4 <3.2.0" - build_runner: ^2.4.9 + build_runner: ^2.4.15 build_test: ^3.1.1 build_version: ^2.1.1 - build_web_compilers: ^4.0.0 + build_web_compilers: ^4.1.4 code_excerpt_updater: git: url: https://github.com/dart-lang/site-shared path: packages/code_excerpt_updater # TODO: Bump when global SDK >=3.1 ref: 923adadacbb95f11d222e6fc6135f6dbb66f84ee - json_serializable: ">=6.9.4 <6.10.0" + json_serializable: ^6.11.0 path: ^1.8.0 test: ^1.22.1 diff --git a/packages/amplify_datastore/Makefile b/packages/amplify_datastore/Makefile index 7b3f574bc11..1e6e373897c 100644 --- a/packages/amplify_datastore/Makefile +++ b/packages/amplify_datastore/Makefile @@ -1,4 +1,4 @@ .PHONY: pigeons pigeons: dart run pigeon --input pigeons/native_plugin.dart - dart format --fix lib/src/native_plugin.g.dart + dart format lib/src/native_plugin.g.dart diff --git a/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/pigeons/NativePluginBindings.kt b/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/pigeons/NativePluginBindings.kt index 484bd702166..fa8749ad727 100644 --- a/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/pigeons/NativePluginBindings.kt +++ b/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/pigeons/NativePluginBindings.kt @@ -1,7 +1,7 @@ // // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v25.5.0), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon @file:Suppress("UNCHECKED_CAST", "ArrayInDataClass") @@ -63,7 +63,7 @@ private object NativePluginBindingsPigeonUtils { } if (a is Map<*, *> && b is Map<*, *>) { return a.size == b.size && a.all { - (b as Map).containsKey(it.key) && + (b as Map).contains(it.key) && deepEquals(it.value, b[it.key]) } } diff --git a/packages/amplify_datastore/ios/Classes/pigeons/NativePluginBindings.swift b/packages/amplify_datastore/ios/Classes/pigeons/NativePluginBindings.swift index 4b19ffc64d5..67d6272a585 100644 --- a/packages/amplify_datastore/ios/Classes/pigeons/NativePluginBindings.swift +++ b/packages/amplify_datastore/ios/Classes/pigeons/NativePluginBindings.swift @@ -1,7 +1,7 @@ // // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v25.5.0), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon import Foundation diff --git a/packages/amplify_datastore/lib/src/native_plugin.g.dart b/packages/amplify_datastore/lib/src/native_plugin.g.dart index fffbb80ba7f..26abbdc9898 100644 --- a/packages/amplify_datastore/lib/src/native_plugin.g.dart +++ b/packages/amplify_datastore/lib/src/native_plugin.g.dart @@ -1,7 +1,7 @@ // // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v25.5.0), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers diff --git a/packages/amplify_datastore/pubspec.yaml b/packages/amplify_datastore/pubspec.yaml index 8e8cb8be335..dc3f2eb55c9 100644 --- a/packages/amplify_datastore/pubspec.yaml +++ b/packages/amplify_datastore/pubspec.yaml @@ -25,7 +25,7 @@ dev_dependencies: flutter_test: sdk: flutter fake_async: ^1.2.0 - pigeon: ^25.5.0 + pigeon: ^26.0.0 # The following section is specific to Flutter. flutter: diff --git a/packages/amplify_native_legacy_wrapper/Makefile b/packages/amplify_native_legacy_wrapper/Makefile index ff24ab19299..9d33fe71786 100644 --- a/packages/amplify_native_legacy_wrapper/Makefile +++ b/packages/amplify_native_legacy_wrapper/Makefile @@ -1,4 +1,4 @@ .PHONY: pigeons pigeons: dart run pigeon --input pigeons/messages.dart - dart format --fix lib/amplify_native_legacy_plugin.g.dart + dart format lib/amplify_native_legacy_plugin.g.dart diff --git a/packages/amplify_native_legacy_wrapper/android/src/main/kotlin/com/amazonaws/amplify/amplify_native_legacy_wrapper/pigeons/LegacyNativePluginPigeon.kt b/packages/amplify_native_legacy_wrapper/android/src/main/kotlin/com/amazonaws/amplify/amplify_native_legacy_wrapper/pigeons/LegacyNativePluginPigeon.kt index 0d67d094602..3f1a373d576 100644 --- a/packages/amplify_native_legacy_wrapper/android/src/main/kotlin/com/amazonaws/amplify/amplify_native_legacy_wrapper/pigeons/LegacyNativePluginPigeon.kt +++ b/packages/amplify_native_legacy_wrapper/android/src/main/kotlin/com/amazonaws/amplify/amplify_native_legacy_wrapper/pigeons/LegacyNativePluginPigeon.kt @@ -1,7 +1,7 @@ // // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v25.5.0), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon @file:Suppress("UNCHECKED_CAST", "ArrayInDataClass") diff --git a/packages/amplify_native_legacy_wrapper/ios/Classes/Pigeons/AmplifyNativeLegacyPlugin.swift b/packages/amplify_native_legacy_wrapper/ios/Classes/Pigeons/AmplifyNativeLegacyPlugin.swift index d6ee792ceb8..17bce581722 100644 --- a/packages/amplify_native_legacy_wrapper/ios/Classes/Pigeons/AmplifyNativeLegacyPlugin.swift +++ b/packages/amplify_native_legacy_wrapper/ios/Classes/Pigeons/AmplifyNativeLegacyPlugin.swift @@ -1,7 +1,7 @@ // // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v25.5.0), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon import Foundation diff --git a/packages/amplify_native_legacy_wrapper/lib/amplify_native_legacy_plugin.g.dart b/packages/amplify_native_legacy_wrapper/lib/amplify_native_legacy_plugin.g.dart index 3295437692f..0a745ab6a63 100644 --- a/packages/amplify_native_legacy_wrapper/lib/amplify_native_legacy_plugin.g.dart +++ b/packages/amplify_native_legacy_wrapper/lib/amplify_native_legacy_plugin.g.dart @@ -1,7 +1,7 @@ // // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v25.5.0), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers diff --git a/packages/amplify_native_legacy_wrapper/pubspec.yaml b/packages/amplify_native_legacy_wrapper/pubspec.yaml index 99aabdf7425..86fa27bb752 100644 --- a/packages/amplify_native_legacy_wrapper/pubspec.yaml +++ b/packages/amplify_native_legacy_wrapper/pubspec.yaml @@ -15,7 +15,7 @@ dev_dependencies: amplify_lints: ">=3.1.0 <3.2.0" flutter_test: sdk: flutter - pigeon: ^25.5.0 + pigeon: ^26.0.0 flutter: plugin: diff --git a/packages/analytics/amplify_analytics_pinpoint/Makefile b/packages/analytics/amplify_analytics_pinpoint/Makefile index 3f9e9face42..19a05764cd4 100644 --- a/packages/analytics/amplify_analytics_pinpoint/Makefile +++ b/packages/analytics/amplify_analytics_pinpoint/Makefile @@ -1,4 +1,4 @@ .PHONY: pigeons pigeons: dart run pigeon --input pigeons/pigeon_config_android.dart - dart format --fix lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart + dart format lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart diff --git a/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/Messages.java b/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/Messages.java index ebc1af73486..34d9ad9af54 100644 --- a/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/Messages.java +++ b/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/Messages.java @@ -1,6 +1,6 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v25.5.0), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon package com.amazonaws.amplify.amplify_analytics_pinpoint; diff --git a/packages/analytics/amplify_analytics_pinpoint/example/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint/example/pubspec.yaml index b348c391df0..6bad4c7fe8d 100644 --- a/packages/analytics/amplify_analytics_pinpoint/example/pubspec.yaml +++ b/packages/analytics/amplify_analytics_pinpoint/example/pubspec.yaml @@ -25,14 +25,14 @@ dev_dependencies: amplify_lints: path: ../../../amplify_lints aws_common: ">=0.4.0 <0.5.0" - build_runner: ^2.4.9 + build_runner: ^2.4.15 built_value: ^8.10.1 flutter_test: sdk: flutter integration_test: sdk: flutter json_annotation: ^4.9.0 - json_serializable: ">=6.9.4 <6.10.0" + json_serializable: ^6.11.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart b/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart index c5a1482d2ad..6a3cb29c5ba 100644 --- a/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart @@ -1,6 +1,6 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v25.5.0), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers diff --git a/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml index 1b6837cab98..ff2c9a0e90f 100644 --- a/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml +++ b/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml @@ -36,7 +36,7 @@ dev_dependencies: amplify_lints: ">=3.1.4 <3.2.0" flutter_test: sdk: flutter - pigeon: ^25.5.0 + pigeon: ^26.0.0 flutter: plugin: diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/analytics_client/event_client/event_client.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/analytics_client/event_client/event_client.dart index 3f347843719..6cb50eaec99 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/analytics_client/event_client/event_client.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/impl/analytics_client/event_client/event_client.dart @@ -141,7 +141,8 @@ class EventClient implements Closeable { .result; // Parse the EndpointResponse portion of Result - final endpointResponse = result.eventsResponse.results?[_fixedEndpointId]; + final endpointResponse = + result.eventsResponse?.results?[_fixedEndpointId]; if (endpointResponse == null) { _logger.warn( @@ -250,7 +251,7 @@ class EventClient implements Closeable { return statusCode != null && statusCode >= 500 && statusCode < 600; } - bool _shouldRetryEvent(String eventId, String eventType) { + bool _shouldRetryEvent(String eventId, String? eventType) { final timesFailed = _failureCountByEvent[eventId] ?? 1; if (timesFailed >= 3) { _logger.warn('Retry limit exceeded, deleting event: $eventType'); diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/pinpoint.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/pinpoint.dart index d8df5a64f5f..17baa123e50 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/pinpoint.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/pinpoint.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.2. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas,unnecessary_library_name +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name /// # Amazon Pinpoint /// diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/common/endpoint_resolver.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/common/endpoint_resolver.dart index a64082fdf8f..0ff38388571 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/common/endpoint_resolver.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/common/endpoint_resolver.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.common.endpoint_resolver; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/common/serializers.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/common/serializers.dart index cad9cb1ea45..236dc094297 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/common/serializers.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/common/serializers.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.common.serializers; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/alignment.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/alignment.dart index bec4f9ba940..53afd6c3d23 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/alignment.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/alignment.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.alignment; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/attribute_dimension.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/attribute_dimension.dart index 12992754fc6..92f08f951bc 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/attribute_dimension.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/attribute_dimension.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.attribute_dimension; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -19,11 +19,11 @@ abstract class AttributeDimension /// Specifies attribute-based criteria for including or excluding endpoints from a segment. factory AttributeDimension({ AttributeType? attributeType, - required List values, + List? values, }) { return _$AttributeDimension._( attributeType: attributeType, - values: _i2.BuiltList(values), + values: values == null ? null : _i2.BuiltList(values), ); } @@ -50,9 +50,10 @@ abstract class AttributeDimension AttributeType? get attributeType; /// The criteria values to use for the segment dimension. Depending on the value of the AttributeType property, endpoints are included or excluded from the segment if their attribute values match the criteria values. - _i2.BuiltList get values; + _i2.BuiltList? get values; @override List get props => [attributeType, values]; + @override String toString() { final helper = newBuiltValueToStringHelper('AttributeDimension') @@ -68,10 +69,12 @@ class AttributeDimensionRestJson1Serializer @override Iterable get types => const [AttributeDimension, _$AttributeDimension]; + @override Iterable<_i3.ShapeId> get supportedProtocols => const [ _i3.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override AttributeDimension deserialize( Serializers serializers, @@ -119,13 +122,6 @@ class AttributeDimensionRestJson1Serializer }) { final result$ = []; final AttributeDimension(:attributeType, :values) = object; - result$.addAll([ - 'Values', - serializers.serialize( - values, - specifiedType: const FullType(_i2.BuiltList, [FullType(String)]), - ), - ]); if (attributeType != null) { result$ ..add('AttributeType') @@ -136,6 +132,16 @@ class AttributeDimensionRestJson1Serializer ), ); } + if (values != null) { + result$ + ..add('Values') + ..add( + serializers.serialize( + values, + specifiedType: const FullType(_i2.BuiltList, [FullType(String)]), + ), + ); + } return result$; } } diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/attribute_dimension.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/attribute_dimension.g.dart index e657fcefc23..fc4ac86e725 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/attribute_dimension.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/attribute_dimension.g.dart @@ -10,14 +10,13 @@ class _$AttributeDimension extends AttributeDimension { @override final AttributeType? attributeType; @override - final _i2.BuiltList values; + final _i2.BuiltList? values; factory _$AttributeDimension([ void Function(AttributeDimensionBuilder)? updates, ]) => (AttributeDimensionBuilder()..update(updates))._build(); - _$AttributeDimension._({this.attributeType, required this.values}) - : super._(); + _$AttributeDimension._({this.attributeType, this.values}) : super._(); @override AttributeDimension rebuild( void Function(AttributeDimensionBuilder) updates, @@ -65,7 +64,7 @@ class AttributeDimensionBuilder final $v = _$v; if ($v != null) { _attributeType = $v.attributeType; - _values = $v.values.toBuilder(); + _values = $v.values?.toBuilder(); _$v = null; } return this; @@ -91,13 +90,13 @@ class AttributeDimensionBuilder _$v ?? _$AttributeDimension._( attributeType: attributeType, - values: values.build(), + values: _values?.build(), ); } catch (_) { late String _$failedField; try { _$failedField = 'values'; - values.build(); + _values?.build(); } catch (e) { throw BuiltValueNestedFieldError( r'AttributeDimension', diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/attribute_type.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/attribute_type.dart index c5dd785417a..3a395246885 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/attribute_type.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/attribute_type.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.attribute_type; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/bad_request_exception.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/bad_request_exception.dart index 8c443574474..aa447ddb3ff 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/bad_request_exception.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/bad_request_exception.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.bad_request_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -51,18 +51,23 @@ abstract class BadRequestException namespace: 'com.amazonaws.pinpoint', shape: 'BadRequestException', ); + @override _i2.RetryConfig? get retryConfig => null; + @override @BuiltValueField(compare: false) int get statusCode => 400; + @override @BuiltValueField(compare: false) Map? get headers; @override Exception? get underlyingException => null; + @override List get props => [message, requestId]; + @override String toString() { final helper = newBuiltValueToStringHelper('BadRequestException') @@ -81,10 +86,12 @@ class BadRequestExceptionRestJson1Serializer BadRequestException, _$BadRequestException, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override BadRequestException deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/button_action.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/button_action.dart index 6259ed46153..745058082d3 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/button_action.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/button_action.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.button_action; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/campaign_event_filter.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/campaign_event_filter.dart index eea01cf0013..4780acdbf84 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/campaign_event_filter.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/campaign_event_filter.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.campaign_event_filter; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -18,8 +18,8 @@ abstract class CampaignEventFilter implements Built { /// Specifies the settings for events that cause a campaign to be sent. factory CampaignEventFilter({ - required EventDimensions dimensions, - required FilterType filterType, + EventDimensions? dimensions, + FilterType? filterType, }) { return _$CampaignEventFilter._( dimensions: dimensions, @@ -39,12 +39,13 @@ abstract class CampaignEventFilter ]; /// The dimension settings of the event filter for the campaign. - EventDimensions get dimensions; + EventDimensions? get dimensions; /// The type of event that causes the campaign to be sent. Valid values are: SYSTEM, sends the campaign when a system event occurs; and, ENDPOINT, sends the campaign when an endpoint event (Events resource) occurs. - FilterType get filterType; + FilterType? get filterType; @override List get props => [dimensions, filterType]; + @override String toString() { final helper = newBuiltValueToStringHelper('CampaignEventFilter') @@ -63,10 +64,12 @@ class CampaignEventFilterRestJson1Serializer CampaignEventFilter, _$CampaignEventFilter, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override CampaignEventFilter deserialize( Serializers serializers, @@ -112,18 +115,26 @@ class CampaignEventFilterRestJson1Serializer }) { final result$ = []; final CampaignEventFilter(:dimensions, :filterType) = object; - result$.addAll([ - 'Dimensions', - serializers.serialize( - dimensions, - specifiedType: const FullType(EventDimensions), - ), - 'FilterType', - serializers.serialize( - filterType, - specifiedType: const FullType(FilterType), - ), - ]); + if (dimensions != null) { + result$ + ..add('Dimensions') + ..add( + serializers.serialize( + dimensions, + specifiedType: const FullType(EventDimensions), + ), + ); + } + if (filterType != null) { + result$ + ..add('FilterType') + ..add( + serializers.serialize( + filterType, + specifiedType: const FullType(FilterType), + ), + ); + } return result$; } } diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/campaign_event_filter.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/campaign_event_filter.g.dart index e6c80edb8e8..6c4cd54a1eb 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/campaign_event_filter.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/campaign_event_filter.g.dart @@ -8,16 +8,15 @@ part of 'campaign_event_filter.dart'; class _$CampaignEventFilter extends CampaignEventFilter { @override - final EventDimensions dimensions; + final EventDimensions? dimensions; @override - final FilterType filterType; + final FilterType? filterType; factory _$CampaignEventFilter([ void Function(CampaignEventFilterBuilder)? updates, ]) => (CampaignEventFilterBuilder()..update(updates))._build(); - _$CampaignEventFilter._({required this.dimensions, required this.filterType}) - : super._(); + _$CampaignEventFilter._({this.dimensions, this.filterType}) : super._(); @override CampaignEventFilter rebuild( void Function(CampaignEventFilterBuilder) updates, @@ -64,7 +63,7 @@ class CampaignEventFilterBuilder CampaignEventFilterBuilder get _$this { final $v = _$v; if ($v != null) { - _dimensions = $v.dimensions.toBuilder(); + _dimensions = $v.dimensions?.toBuilder(); _filterType = $v.filterType; _$v = null; } @@ -90,18 +89,14 @@ class CampaignEventFilterBuilder _$result = _$v ?? _$CampaignEventFilter._( - dimensions: dimensions.build(), - filterType: BuiltValueNullFieldError.checkNotNull( - filterType, - r'CampaignEventFilter', - 'filterType', - ), + dimensions: _dimensions?.build(), + filterType: filterType, ); } catch (_) { late String _$failedField; try { _$failedField = 'dimensions'; - dimensions.build(); + _dimensions?.build(); } catch (e) { throw BuiltValueNestedFieldError( r'CampaignEventFilter', diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/channel_type.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/channel_type.dart index 530912b2eae..e7dc57d4055 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/channel_type.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/channel_type.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.channel_type; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/default_button_configuration.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/default_button_configuration.dart index 325594e0d9b..8af5cca3157 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/default_button_configuration.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/default_button_configuration.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.default_button_configuration; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -20,9 +20,9 @@ abstract class DefaultButtonConfiguration factory DefaultButtonConfiguration({ String? backgroundColor, int? borderRadius, - required ButtonAction buttonAction, + ButtonAction? buttonAction, String? link, - required String text, + String? text, String? textColor, }) { return _$DefaultButtonConfiguration._( @@ -52,13 +52,13 @@ abstract class DefaultButtonConfiguration int? get borderRadius; /// Action triggered by the button. - ButtonAction get buttonAction; + ButtonAction? get buttonAction; /// Button destination. String? get link; /// Button text. - String get text; + String? get text; /// The text color of the button. String? get textColor; @@ -71,6 +71,7 @@ abstract class DefaultButtonConfiguration text, textColor, ]; + @override String toString() { final helper = newBuiltValueToStringHelper('DefaultButtonConfiguration') @@ -94,10 +95,12 @@ class DefaultButtonConfigurationRestJson1Serializer DefaultButtonConfiguration, _$DefaultButtonConfiguration, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override DefaultButtonConfiguration deserialize( Serializers serializers, @@ -177,15 +180,6 @@ class DefaultButtonConfigurationRestJson1Serializer :text, :textColor, ) = object; - result$.addAll([ - 'ButtonAction', - serializers.serialize( - buttonAction, - specifiedType: const FullType(ButtonAction), - ), - 'Text', - serializers.serialize(text, specifiedType: const FullType(String)), - ]); if (backgroundColor != null) { result$ ..add('BackgroundColor') @@ -206,6 +200,16 @@ class DefaultButtonConfigurationRestJson1Serializer ), ); } + if (buttonAction != null) { + result$ + ..add('ButtonAction') + ..add( + serializers.serialize( + buttonAction, + specifiedType: const FullType(ButtonAction), + ), + ); + } if (link != null) { result$ ..add('Link') @@ -213,6 +217,13 @@ class DefaultButtonConfigurationRestJson1Serializer serializers.serialize(link, specifiedType: const FullType(String)), ); } + if (text != null) { + result$ + ..add('Text') + ..add( + serializers.serialize(text, specifiedType: const FullType(String)), + ); + } if (textColor != null) { result$ ..add('TextColor') diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/default_button_configuration.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/default_button_configuration.g.dart index d9d066d81b2..a798eb13d43 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/default_button_configuration.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/default_button_configuration.g.dart @@ -12,11 +12,11 @@ class _$DefaultButtonConfiguration extends DefaultButtonConfiguration { @override final int? borderRadius; @override - final ButtonAction buttonAction; + final ButtonAction? buttonAction; @override final String? link; @override - final String text; + final String? text; @override final String? textColor; @@ -27,9 +27,9 @@ class _$DefaultButtonConfiguration extends DefaultButtonConfiguration { _$DefaultButtonConfiguration._({ this.backgroundColor, this.borderRadius, - required this.buttonAction, + this.buttonAction, this.link, - required this.text, + this.text, this.textColor, }) : super._(); @override @@ -133,17 +133,9 @@ class DefaultButtonConfigurationBuilder _$DefaultButtonConfiguration._( backgroundColor: backgroundColor, borderRadius: borderRadius, - buttonAction: BuiltValueNullFieldError.checkNotNull( - buttonAction, - r'DefaultButtonConfiguration', - 'buttonAction', - ), + buttonAction: buttonAction, link: link, - text: BuiltValueNullFieldError.checkNotNull( - text, - r'DefaultButtonConfiguration', - 'text', - ), + text: text, textColor: textColor, ); replace(_$result); diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/dimension_type.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/dimension_type.dart index fb981f70d5a..4c46bfb17b8 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/dimension_type.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/dimension_type.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.dimension_type; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_batch_item.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_batch_item.dart index 9217e444205..7b084133dc4 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_batch_item.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_batch_item.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.endpoint_batch_item; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -115,6 +115,7 @@ abstract class EndpointBatchItem requestId, user, ]; + @override String toString() { final helper = newBuiltValueToStringHelper('EndpointBatchItem') @@ -140,10 +141,12 @@ class EndpointBatchItemRestJson1Serializer @override Iterable get types => const [EndpointBatchItem, _$EndpointBatchItem]; + @override Iterable<_i3.ShapeId> get supportedProtocols => const [ _i3.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override EndpointBatchItem deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_batch_request.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_batch_request.dart index 1d636a0b71d..43f17f9d260 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_batch_request.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_batch_request.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.endpoint_batch_request; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -17,8 +17,10 @@ abstract class EndpointBatchRequest with _i1.AWSEquatable implements Built { /// Specifies a batch of endpoints to create or update and the settings and attributes to set or change for each endpoint. - factory EndpointBatchRequest({required List item}) { - return _$EndpointBatchRequest._(item: _i2.BuiltList(item)); + factory EndpointBatchRequest({List? item}) { + return _$EndpointBatchRequest._( + item: item == null ? null : _i2.BuiltList(item), + ); } /// Specifies a batch of endpoints to create or update and the settings and attributes to set or change for each endpoint. @@ -33,9 +35,10 @@ abstract class EndpointBatchRequest ]; /// An array that defines the endpoints to create or update and, for each endpoint, the property values to set or change. An array can contain a maximum of 100 items. - _i2.BuiltList get item; + _i2.BuiltList? get item; @override List get props => [item]; + @override String toString() { final helper = newBuiltValueToStringHelper('EndpointBatchRequest') @@ -54,10 +57,12 @@ class EndpointBatchRequestRestJson1Serializer EndpointBatchRequest, _$EndpointBatchRequest, ]; + @override Iterable<_i3.ShapeId> get supportedProtocols => const [ _i3.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override EndpointBatchRequest deserialize( Serializers serializers, @@ -98,15 +103,18 @@ class EndpointBatchRequestRestJson1Serializer }) { final result$ = []; final EndpointBatchRequest(:item) = object; - result$.addAll([ - 'Item', - serializers.serialize( - item, - specifiedType: const FullType(_i2.BuiltList, [ - FullType(EndpointBatchItem), - ]), - ), - ]); + if (item != null) { + result$ + ..add('Item') + ..add( + serializers.serialize( + item, + specifiedType: const FullType(_i2.BuiltList, [ + FullType(EndpointBatchItem), + ]), + ), + ); + } return result$; } } diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_batch_request.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_batch_request.g.dart index 18c6912bd48..c95d989ef44 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_batch_request.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_batch_request.g.dart @@ -8,13 +8,13 @@ part of 'endpoint_batch_request.dart'; class _$EndpointBatchRequest extends EndpointBatchRequest { @override - final _i2.BuiltList item; + final _i2.BuiltList? item; factory _$EndpointBatchRequest([ void Function(EndpointBatchRequestBuilder)? updates, ]) => (EndpointBatchRequestBuilder()..update(updates))._build(); - _$EndpointBatchRequest._({required this.item}) : super._(); + _$EndpointBatchRequest._({this.item}) : super._(); @override EndpointBatchRequest rebuild( void Function(EndpointBatchRequestBuilder) updates, @@ -53,7 +53,7 @@ class EndpointBatchRequestBuilder EndpointBatchRequestBuilder get _$this { final $v = _$v; if ($v != null) { - _item = $v.item.toBuilder(); + _item = $v.item?.toBuilder(); _$v = null; } return this; @@ -75,12 +75,12 @@ class EndpointBatchRequestBuilder _$EndpointBatchRequest _build() { _$EndpointBatchRequest _$result; try { - _$result = _$v ?? _$EndpointBatchRequest._(item: item.build()); + _$result = _$v ?? _$EndpointBatchRequest._(item: _item?.build()); } catch (_) { late String _$failedField; try { _$failedField = 'item'; - item.build(); + _item?.build(); } catch (e) { throw BuiltValueNestedFieldError( r'EndpointBatchRequest', diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_demographic.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_demographic.dart index 076d3bec0ae..8837713a00c 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_demographic.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_demographic.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.endpoint_demographic; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -82,6 +82,7 @@ abstract class EndpointDemographic platformVersion, timezone, ]; + @override String toString() { final helper = newBuiltValueToStringHelper('EndpointDemographic') @@ -106,10 +107,12 @@ class EndpointDemographicRestJson1Serializer EndpointDemographic, _$EndpointDemographic, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override EndpointDemographic deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_item_response.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_item_response.dart index bde0bd02dd8..e626ee36f5b 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_item_response.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_item_response.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.endpoint_item_response; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -37,6 +37,7 @@ abstract class EndpointItemResponse int? get statusCode; @override List get props => [message, statusCode]; + @override String toString() { final helper = newBuiltValueToStringHelper('EndpointItemResponse') @@ -56,10 +57,12 @@ class EndpointItemResponseRestJson1Serializer EndpointItemResponse, _$EndpointItemResponse, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override EndpointItemResponse deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_location.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_location.dart index 1c836100a61..e3363f32256 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_location.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_location.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.endpoint_location; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -70,6 +70,7 @@ abstract class EndpointLocation postalCode, region, ]; + @override String toString() { final helper = newBuiltValueToStringHelper('EndpointLocation') @@ -89,10 +90,12 @@ class EndpointLocationRestJson1Serializer @override Iterable get types => const [EndpointLocation, _$EndpointLocation]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override EndpointLocation deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_request.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_request.dart index a991f153ff7..61013603972 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_request.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_request.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.endpoint_request; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -109,6 +109,7 @@ abstract class EndpointRequest requestId, user, ]; + @override String toString() { final helper = newBuiltValueToStringHelper('EndpointRequest') @@ -133,10 +134,12 @@ class EndpointRequestRestJson1Serializer @override Iterable get types => const [EndpointRequest, _$EndpointRequest]; + @override Iterable<_i3.ShapeId> get supportedProtocols => const [ _i3.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override EndpointRequest deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_response.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_response.dart index 55baaf6f58c..08cf51dd486 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_response.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_response.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.endpoint_response; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -131,6 +131,7 @@ abstract class EndpointResponse requestId, user, ]; + @override String toString() { final helper = newBuiltValueToStringHelper('EndpointResponse') @@ -159,10 +160,12 @@ class EndpointResponseRestJson1Serializer @override Iterable get types => const [EndpointResponse, _$EndpointResponse]; + @override Iterable<_i3.ShapeId> get supportedProtocols => const [ _i3.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override EndpointResponse deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_user.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_user.dart index 888d3c3a1f2..3cef46dfe65 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_user.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/endpoint_user.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.endpoint_user; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -47,6 +47,7 @@ abstract class EndpointUser String? get userId; @override List get props => [userAttributes, userId]; + @override String toString() { final helper = newBuiltValueToStringHelper('EndpointUser') @@ -62,10 +63,12 @@ class EndpointUserRestJson1Serializer @override Iterable get types => const [EndpointUser, _$EndpointUser]; + @override Iterable<_i3.ShapeId> get supportedProtocols => const [ _i3.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override EndpointUser deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/event.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/event.dart index 6dff83858b3..d86a50be279 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/event.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/event.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.event; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -23,11 +23,11 @@ abstract class Event String? appVersionCode, Map? attributes, String? clientSdkVersion, - required String eventType, + String? eventType, Map? metrics, String? sdkName, Session? session, - required String timestamp, + String? timestamp, }) { return _$Event._( appPackageName: appPackageName, @@ -68,7 +68,7 @@ abstract class Event String? get clientSdkVersion; /// The name of the event. - String get eventType; + String? get eventType; /// One or more custom metrics that are associated with the event. _i2.BuiltMap? get metrics; @@ -80,7 +80,7 @@ abstract class Event Session? get session; /// The date and time, in ISO 8601 format, when the event occurred. - String get timestamp; + String? get timestamp; @override List get props => [ appPackageName, @@ -94,6 +94,7 @@ abstract class Event session, timestamp, ]; + @override String toString() { final helper = newBuiltValueToStringHelper('Event') @@ -116,10 +117,12 @@ class EventRestJson1Serializer extends _i3.StructuredSmithySerializer { @override Iterable get types => const [Event, _$Event]; + @override Iterable<_i3.ShapeId> get supportedProtocols => const [ _i3.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override Event deserialize( Serializers serializers, @@ -240,12 +243,6 @@ class EventRestJson1Serializer extends _i3.StructuredSmithySerializer { :session, :timestamp, ) = object; - result$.addAll([ - 'EventType', - serializers.serialize(eventType, specifiedType: const FullType(String)), - 'Timestamp', - serializers.serialize(timestamp, specifiedType: const FullType(String)), - ]); if (appPackageName != null) { result$ ..add('AppPackageName') @@ -299,6 +296,16 @@ class EventRestJson1Serializer extends _i3.StructuredSmithySerializer { ), ); } + if (eventType != null) { + result$ + ..add('EventType') + ..add( + serializers.serialize( + eventType, + specifiedType: const FullType(String), + ), + ); + } if (metrics != null) { result$ ..add('Metrics') @@ -329,6 +336,16 @@ class EventRestJson1Serializer extends _i3.StructuredSmithySerializer { ), ); } + if (timestamp != null) { + result$ + ..add('Timestamp') + ..add( + serializers.serialize( + timestamp, + specifiedType: const FullType(String), + ), + ); + } return result$; } } diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/event.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/event.g.dart index 90daf8c2d37..41364bf982d 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/event.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/event.g.dart @@ -18,7 +18,7 @@ class _$Event extends Event { @override final String? clientSdkVersion; @override - final String eventType; + final String? eventType; @override final _i2.BuiltMap? metrics; @override @@ -26,7 +26,7 @@ class _$Event extends Event { @override final Session? session; @override - final String timestamp; + final String? timestamp; factory _$Event([void Function(EventBuilder)? updates]) => (EventBuilder()..update(updates))._build(); @@ -37,11 +37,11 @@ class _$Event extends Event { this.appVersionCode, this.attributes, this.clientSdkVersion, - required this.eventType, + this.eventType, this.metrics, this.sdkName, this.session, - required this.timestamp, + this.timestamp, }) : super._(); @override Event rebuild(void Function(EventBuilder) updates) => @@ -178,19 +178,11 @@ class EventBuilder implements Builder { appVersionCode: appVersionCode, attributes: _attributes?.build(), clientSdkVersion: clientSdkVersion, - eventType: BuiltValueNullFieldError.checkNotNull( - eventType, - r'Event', - 'eventType', - ), + eventType: eventType, metrics: _metrics?.build(), sdkName: sdkName, session: _session?.build(), - timestamp: BuiltValueNullFieldError.checkNotNull( - timestamp, - r'Event', - 'timestamp', - ), + timestamp: timestamp, ); } catch (_) { late String _$failedField; diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/event_dimensions.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/event_dimensions.dart index b812f39d4f8..d1ce0bff6c8 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/event_dimensions.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/event_dimensions.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.event_dimensions; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -52,6 +52,7 @@ abstract class EventDimensions _i2.BuiltMap? get metrics; @override List get props => [attributes, eventType, metrics]; + @override String toString() { final helper = newBuiltValueToStringHelper('EventDimensions') @@ -68,10 +69,12 @@ class EventDimensionsRestJson1Serializer @override Iterable get types => const [EventDimensions, _$EventDimensions]; + @override Iterable<_i3.ShapeId> get supportedProtocols => const [ _i3.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override EventDimensions deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/event_item_response.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/event_item_response.dart index a100fe02360..f30149091e5 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/event_item_response.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/event_item_response.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.event_item_response; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -37,6 +37,7 @@ abstract class EventItemResponse int? get statusCode; @override List get props => [message, statusCode]; + @override String toString() { final helper = newBuiltValueToStringHelper('EventItemResponse') @@ -52,10 +53,12 @@ class EventItemResponseRestJson1Serializer @override Iterable get types => const [EventItemResponse, _$EventItemResponse]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override EventItemResponse deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_batch.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_batch.dart index 759b9fb08eb..04b0c7ce938 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_batch.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_batch.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.events_batch; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -18,11 +18,11 @@ abstract class EventsBatch with _i1.AWSEquatable implements Built { /// Specifies a batch of endpoints and events to process. - factory EventsBatch({ - required PublicEndpoint endpoint, - required Map events, - }) { - return _$EventsBatch._(endpoint: endpoint, events: _i2.BuiltMap(events)); + factory EventsBatch({PublicEndpoint? endpoint, Map? events}) { + return _$EventsBatch._( + endpoint: endpoint, + events: events == null ? null : _i2.BuiltMap(events), + ); } /// Specifies a batch of endpoints and events to process. @@ -36,12 +36,13 @@ abstract class EventsBatch ]; /// A set of properties and attributes that are associated with the endpoint. - PublicEndpoint get endpoint; + PublicEndpoint? get endpoint; /// A set of properties that are associated with the event. - _i2.BuiltMap get events; + _i2.BuiltMap? get events; @override List get props => [endpoint, events]; + @override String toString() { final helper = newBuiltValueToStringHelper('EventsBatch') @@ -57,10 +58,12 @@ class EventsBatchRestJson1Serializer @override Iterable get types => const [EventsBatch, _$EventsBatch]; + @override Iterable<_i3.ShapeId> get supportedProtocols => const [ _i3.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override EventsBatch deserialize( Serializers serializers, @@ -110,21 +113,29 @@ class EventsBatchRestJson1Serializer }) { final result$ = []; final EventsBatch(:endpoint, :events) = object; - result$.addAll([ - 'Endpoint', - serializers.serialize( - endpoint, - specifiedType: const FullType(PublicEndpoint), - ), - 'Events', - serializers.serialize( - events, - specifiedType: const FullType(_i2.BuiltMap, [ - FullType(String), - FullType(Event), - ]), - ), - ]); + if (endpoint != null) { + result$ + ..add('Endpoint') + ..add( + serializers.serialize( + endpoint, + specifiedType: const FullType(PublicEndpoint), + ), + ); + } + if (events != null) { + result$ + ..add('Events') + ..add( + serializers.serialize( + events, + specifiedType: const FullType(_i2.BuiltMap, [ + FullType(String), + FullType(Event), + ]), + ), + ); + } return result$; } } diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_batch.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_batch.g.dart index bc5b4f778df..73cc7db5c58 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_batch.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_batch.g.dart @@ -8,14 +8,14 @@ part of 'events_batch.dart'; class _$EventsBatch extends EventsBatch { @override - final PublicEndpoint endpoint; + final PublicEndpoint? endpoint; @override - final _i2.BuiltMap events; + final _i2.BuiltMap? events; factory _$EventsBatch([void Function(EventsBatchBuilder)? updates]) => (EventsBatchBuilder()..update(updates))._build(); - _$EventsBatch._({required this.endpoint, required this.events}) : super._(); + _$EventsBatch._({this.endpoint, this.events}) : super._(); @override EventsBatch rebuild(void Function(EventsBatchBuilder) updates) => (toBuilder()..update(updates)).build(); @@ -59,8 +59,8 @@ class EventsBatchBuilder implements Builder { EventsBatchBuilder get _$this { final $v = _$v; if ($v != null) { - _endpoint = $v.endpoint.toBuilder(); - _events = $v.events.toBuilder(); + _endpoint = $v.endpoint?.toBuilder(); + _events = $v.events?.toBuilder(); _$v = null; } return this; @@ -84,14 +84,17 @@ class EventsBatchBuilder implements Builder { try { _$result = _$v ?? - _$EventsBatch._(endpoint: endpoint.build(), events: events.build()); + _$EventsBatch._( + endpoint: _endpoint?.build(), + events: _events?.build(), + ); } catch (_) { late String _$failedField; try { _$failedField = 'endpoint'; - endpoint.build(); + _endpoint?.build(); _$failedField = 'events'; - events.build(); + _events?.build(); } catch (e) { throw BuiltValueNestedFieldError( r'EventsBatch', diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_request.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_request.dart index 809035e904d..351b7696782 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_request.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_request.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.events_request; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -17,8 +17,10 @@ abstract class EventsRequest with _i1.AWSEquatable implements Built { /// Specifies a batch of events to process. - factory EventsRequest({required Map batchItem}) { - return _$EventsRequest._(batchItem: _i2.BuiltMap(batchItem)); + factory EventsRequest({Map? batchItem}) { + return _$EventsRequest._( + batchItem: batchItem == null ? null : _i2.BuiltMap(batchItem), + ); } /// Specifies a batch of events to process. @@ -32,9 +34,10 @@ abstract class EventsRequest ]; /// The batch of events to process. For each item in a batch, the endpoint ID acts as a key that has an EventsBatch object as its value. - _i2.BuiltMap get batchItem; + _i2.BuiltMap? get batchItem; @override List get props => [batchItem]; + @override String toString() { final helper = newBuiltValueToStringHelper('EventsRequest') @@ -49,10 +52,12 @@ class EventsRequestRestJson1Serializer @override Iterable get types => const [EventsRequest, _$EventsRequest]; + @override Iterable<_i3.ShapeId> get supportedProtocols => const [ _i3.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override EventsRequest deserialize( Serializers serializers, @@ -94,16 +99,19 @@ class EventsRequestRestJson1Serializer }) { final result$ = []; final EventsRequest(:batchItem) = object; - result$.addAll([ - 'BatchItem', - serializers.serialize( - batchItem, - specifiedType: const FullType(_i2.BuiltMap, [ - FullType(String), - FullType(EventsBatch), - ]), - ), - ]); + if (batchItem != null) { + result$ + ..add('BatchItem') + ..add( + serializers.serialize( + batchItem, + specifiedType: const FullType(_i2.BuiltMap, [ + FullType(String), + FullType(EventsBatch), + ]), + ), + ); + } return result$; } } diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_request.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_request.g.dart index 7e52aef0e23..9498886bcfd 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_request.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_request.g.dart @@ -8,12 +8,12 @@ part of 'events_request.dart'; class _$EventsRequest extends EventsRequest { @override - final _i2.BuiltMap batchItem; + final _i2.BuiltMap? batchItem; factory _$EventsRequest([void Function(EventsRequestBuilder)? updates]) => (EventsRequestBuilder()..update(updates))._build(); - _$EventsRequest._({required this.batchItem}) : super._(); + _$EventsRequest._({this.batchItem}) : super._(); @override EventsRequest rebuild(void Function(EventsRequestBuilder) updates) => (toBuilder()..update(updates)).build(); @@ -51,7 +51,7 @@ class EventsRequestBuilder EventsRequestBuilder get _$this { final $v = _$v; if ($v != null) { - _batchItem = $v.batchItem.toBuilder(); + _batchItem = $v.batchItem?.toBuilder(); _$v = null; } return this; @@ -73,12 +73,12 @@ class EventsRequestBuilder _$EventsRequest _build() { _$EventsRequest _$result; try { - _$result = _$v ?? _$EventsRequest._(batchItem: batchItem.build()); + _$result = _$v ?? _$EventsRequest._(batchItem: _batchItem?.build()); } catch (_) { late String _$failedField; try { _$failedField = 'batchItem'; - batchItem.build(); + _batchItem?.build(); } catch (e) { throw BuiltValueNestedFieldError( r'EventsRequest', diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_response.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_response.dart index a9cf0948651..cb57f937ee7 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_response.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/events_response.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.events_response; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -37,6 +37,7 @@ abstract class EventsResponse _i2.BuiltMap? get results; @override List get props => [results]; + @override String toString() { final helper = newBuiltValueToStringHelper('EventsResponse') @@ -51,10 +52,12 @@ class EventsResponseRestJson1Serializer @override Iterable get types => const [EventsResponse, _$EventsResponse]; + @override Iterable<_i3.ShapeId> get supportedProtocols => const [ _i3.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override EventsResponse deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/filter_type.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/filter_type.dart index c9b59a4a31c..1768ec4adbc 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/filter_type.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/filter_type.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.filter_type; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/forbidden_exception.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/forbidden_exception.dart index e8d29e59f3e..246b900f977 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/forbidden_exception.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/forbidden_exception.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.forbidden_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -51,18 +51,23 @@ abstract class ForbiddenException namespace: 'com.amazonaws.pinpoint', shape: 'ForbiddenException', ); + @override _i2.RetryConfig? get retryConfig => null; + @override @BuiltValueField(compare: false) int get statusCode => 403; + @override @BuiltValueField(compare: false) Map? get headers; @override Exception? get underlyingException => null; + @override List get props => [message, requestId]; + @override String toString() { final helper = newBuiltValueToStringHelper('ForbiddenException') @@ -78,10 +83,12 @@ class ForbiddenExceptionRestJson1Serializer @override Iterable get types => const [ForbiddenException, _$ForbiddenException]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override ForbiddenException deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_endpoint_request.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_endpoint_request.dart index d577d68c93f..675cc3eadf2 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_endpoint_request.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_endpoint_request.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.get_endpoint_request; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -54,7 +54,7 @@ abstract class GetEndpointRequest /// The unique identifier for the application. This identifier is displayed as the **Project ID** on the Amazon Pinpoint console. String get applicationId; - /// The unique identifier for the endpoint. + /// The case insensitive unique identifier for the endpoint. The identifier can't contain `$`, `{` or `}`. String get endpointId; @override String labelFor(String key) { @@ -69,8 +69,10 @@ abstract class GetEndpointRequest @override GetEndpointRequestPayload getPayload() => GetEndpointRequestPayload(); + @override List get props => [applicationId, endpointId]; + @override String toString() { final helper = newBuiltValueToStringHelper('GetEndpointRequest') @@ -94,6 +96,7 @@ abstract class GetEndpointRequestPayload @override List get props => []; + @override String toString() { final helper = newBuiltValueToStringHelper('GetEndpointRequestPayload'); @@ -112,10 +115,12 @@ class GetEndpointRequestRestJson1Serializer GetEndpointRequestPayload, _$GetEndpointRequestPayload, ]; + @override Iterable<_i1.ShapeId> get supportedProtocols => const [ _i1.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override GetEndpointRequestPayload deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_endpoint_response.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_endpoint_response.dart index adfcb52a599..5cf26071c7a 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_endpoint_response.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_endpoint_response.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.get_endpoint_response; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -16,7 +16,7 @@ abstract class GetEndpointResponse implements Built, _i2.HasPayload { - factory GetEndpointResponse({required EndpointResponse endpointResponse}) { + factory GetEndpointResponse({EndpointResponse? endpointResponse}) { return _$GetEndpointResponse._(endpointResponse: endpointResponse); } @@ -28,22 +28,26 @@ abstract class GetEndpointResponse /// Constructs a [GetEndpointResponse] from a [payload] and [response]. factory GetEndpointResponse.fromResponse( - EndpointResponse payload, + EndpointResponse? payload, _i1.AWSBaseHttpResponse response, ) => GetEndpointResponse.build((b) { - b.endpointResponse.replace(payload); + if (payload != null) { + b.endpointResponse.replace(payload); + } }); - static const List<_i2.SmithySerializer> serializers = [ + static const List<_i2.SmithySerializer> serializers = [ GetEndpointResponseRestJson1Serializer(), ]; /// Provides information about the channel type and other settings for an endpoint. - EndpointResponse get endpointResponse; + EndpointResponse? get endpointResponse; @override - EndpointResponse getPayload() => endpointResponse; + EndpointResponse? getPayload() => endpointResponse ?? EndpointResponse(); + @override List get props => [endpointResponse]; + @override String toString() { final helper = newBuiltValueToStringHelper('GetEndpointResponse') @@ -61,10 +65,12 @@ class GetEndpointResponseRestJson1Serializer GetEndpointResponse, _$GetEndpointResponse, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override EndpointResponse deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_endpoint_response.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_endpoint_response.g.dart index a743e90909d..64870beb2dd 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_endpoint_response.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_endpoint_response.g.dart @@ -8,13 +8,13 @@ part of 'get_endpoint_response.dart'; class _$GetEndpointResponse extends GetEndpointResponse { @override - final EndpointResponse endpointResponse; + final EndpointResponse? endpointResponse; factory _$GetEndpointResponse([ void Function(GetEndpointResponseBuilder)? updates, ]) => (GetEndpointResponseBuilder()..update(updates))._build(); - _$GetEndpointResponse._({required this.endpointResponse}) : super._(); + _$GetEndpointResponse._({this.endpointResponse}) : super._(); @override GetEndpointResponse rebuild( void Function(GetEndpointResponseBuilder) updates, @@ -55,7 +55,7 @@ class GetEndpointResponseBuilder GetEndpointResponseBuilder get _$this { final $v = _$v; if ($v != null) { - _endpointResponse = $v.endpointResponse.toBuilder(); + _endpointResponse = $v.endpointResponse?.toBuilder(); _$v = null; } return this; @@ -79,12 +79,12 @@ class GetEndpointResponseBuilder try { _$result = _$v ?? - _$GetEndpointResponse._(endpointResponse: endpointResponse.build()); + _$GetEndpointResponse._(endpointResponse: _endpointResponse?.build()); } catch (_) { late String _$failedField; try { _$failedField = 'endpointResponse'; - endpointResponse.build(); + _endpointResponse?.build(); } catch (e) { throw BuiltValueNestedFieldError( r'GetEndpointResponse', diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_in_app_messages_request.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_in_app_messages_request.dart index c6e4015a4a6..2b370892f9f 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_in_app_messages_request.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_in_app_messages_request.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.get_in_app_messages_request; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -70,8 +70,10 @@ abstract class GetInAppMessagesRequest @override GetInAppMessagesRequestPayload getPayload() => GetInAppMessagesRequestPayload(); + @override List get props => [applicationId, endpointId]; + @override String toString() { final helper = newBuiltValueToStringHelper('GetInAppMessagesRequest') @@ -98,6 +100,7 @@ abstract class GetInAppMessagesRequestPayload @override List get props => []; + @override String toString() { final helper = newBuiltValueToStringHelper( @@ -119,10 +122,12 @@ class GetInAppMessagesRequestRestJson1Serializer GetInAppMessagesRequestPayload, _$GetInAppMessagesRequestPayload, ]; + @override Iterable<_i1.ShapeId> get supportedProtocols => const [ _i1.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override GetInAppMessagesRequestPayload deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_in_app_messages_response.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_in_app_messages_response.dart index 9649ab86179..042ea611f5b 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_in_app_messages_response.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_in_app_messages_response.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.get_in_app_messages_response; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -17,7 +17,7 @@ abstract class GetInAppMessagesResponse Built, _i2.HasPayload { factory GetInAppMessagesResponse({ - required InAppMessagesResponse inAppMessagesResponse, + InAppMessagesResponse? inAppMessagesResponse, }) { return _$GetInAppMessagesResponse._( inAppMessagesResponse: inAppMessagesResponse, @@ -32,22 +32,26 @@ abstract class GetInAppMessagesResponse /// Constructs a [GetInAppMessagesResponse] from a [payload] and [response]. factory GetInAppMessagesResponse.fromResponse( - InAppMessagesResponse payload, + InAppMessagesResponse? payload, _i1.AWSBaseHttpResponse response, ) => GetInAppMessagesResponse.build((b) { - b.inAppMessagesResponse.replace(payload); + if (payload != null) { + b.inAppMessagesResponse.replace(payload); + } }); - static const List<_i2.SmithySerializer> serializers = [ - GetInAppMessagesResponseRestJson1Serializer(), - ]; + static const List<_i2.SmithySerializer> serializers = + [GetInAppMessagesResponseRestJson1Serializer()]; /// Get in-app messages response object. - InAppMessagesResponse get inAppMessagesResponse; + InAppMessagesResponse? get inAppMessagesResponse; @override - InAppMessagesResponse getPayload() => inAppMessagesResponse; + InAppMessagesResponse? getPayload() => + inAppMessagesResponse ?? InAppMessagesResponse(); + @override List get props => [inAppMessagesResponse]; + @override String toString() { final helper = newBuiltValueToStringHelper('GetInAppMessagesResponse') @@ -66,10 +70,12 @@ class GetInAppMessagesResponseRestJson1Serializer GetInAppMessagesResponse, _$GetInAppMessagesResponse, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override InAppMessagesResponse deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_in_app_messages_response.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_in_app_messages_response.g.dart index a12a7baf6d1..f36da5f6e59 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_in_app_messages_response.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/get_in_app_messages_response.g.dart @@ -8,14 +8,13 @@ part of 'get_in_app_messages_response.dart'; class _$GetInAppMessagesResponse extends GetInAppMessagesResponse { @override - final InAppMessagesResponse inAppMessagesResponse; + final InAppMessagesResponse? inAppMessagesResponse; factory _$GetInAppMessagesResponse([ void Function(GetInAppMessagesResponseBuilder)? updates, ]) => (GetInAppMessagesResponseBuilder()..update(updates))._build(); - _$GetInAppMessagesResponse._({required this.inAppMessagesResponse}) - : super._(); + _$GetInAppMessagesResponse._({this.inAppMessagesResponse}) : super._(); @override GetInAppMessagesResponse rebuild( void Function(GetInAppMessagesResponseBuilder) updates, @@ -58,7 +57,7 @@ class GetInAppMessagesResponseBuilder GetInAppMessagesResponseBuilder get _$this { final $v = _$v; if ($v != null) { - _inAppMessagesResponse = $v.inAppMessagesResponse.toBuilder(); + _inAppMessagesResponse = $v.inAppMessagesResponse?.toBuilder(); _$v = null; } return this; @@ -83,13 +82,13 @@ class GetInAppMessagesResponseBuilder _$result = _$v ?? _$GetInAppMessagesResponse._( - inAppMessagesResponse: inAppMessagesResponse.build(), + inAppMessagesResponse: _inAppMessagesResponse?.build(), ); } catch (_) { late String _$failedField; try { _$failedField = 'inAppMessagesResponse'; - inAppMessagesResponse.build(); + _inAppMessagesResponse?.build(); } catch (e) { throw BuiltValueNestedFieldError( r'GetInAppMessagesResponse', diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_campaign_schedule.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_campaign_schedule.dart index 969010dff25..671e14c4ca5 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_campaign_schedule.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_campaign_schedule.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.in_app_campaign_schedule; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -50,6 +50,7 @@ abstract class InAppCampaignSchedule QuietTime? get quietTime; @override List get props => [endDate, eventFilter, quietTime]; + @override String toString() { final helper = newBuiltValueToStringHelper('InAppCampaignSchedule') @@ -70,10 +71,12 @@ class InAppCampaignScheduleRestJson1Serializer InAppCampaignSchedule, _$InAppCampaignSchedule, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override InAppCampaignSchedule deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message.dart index e95e35ee471..13d1fc3e974 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.in_app_message; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -50,6 +50,7 @@ abstract class InAppMessage Layout? get layout; @override List get props => [content, customConfig, layout]; + @override String toString() { final helper = newBuiltValueToStringHelper('InAppMessage') @@ -66,10 +67,12 @@ class InAppMessageRestJson1Serializer @override Iterable get types => const [InAppMessage, _$InAppMessage]; + @override Iterable<_i3.ShapeId> get supportedProtocols => const [ _i3.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override InAppMessage deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_body_config.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_body_config.dart index a4ae6c87e7b..8459a14dd19 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_body_config.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_body_config.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.in_app_message_body_config; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -17,9 +17,9 @@ abstract class InAppMessageBodyConfig implements Built { /// Text config for Message Body. factory InAppMessageBodyConfig({ - required Alignment alignment, - required String body, - required String textColor, + Alignment? alignment, + String? body, + String? textColor, }) { return _$InAppMessageBodyConfig._( alignment: alignment, @@ -39,15 +39,16 @@ abstract class InAppMessageBodyConfig [InAppMessageBodyConfigRestJson1Serializer()]; /// The alignment of the text. Valid values: LEFT, CENTER, RIGHT. - Alignment get alignment; + Alignment? get alignment; /// Message Body. - String get body; + String? get body; /// The text color. - String get textColor; + String? get textColor; @override List get props => [alignment, body, textColor]; + @override String toString() { final helper = newBuiltValueToStringHelper('InAppMessageBodyConfig') @@ -68,10 +69,12 @@ class InAppMessageBodyConfigRestJson1Serializer InAppMessageBodyConfig, _$InAppMessageBodyConfig, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override InAppMessageBodyConfig deserialize( Serializers serializers, @@ -123,17 +126,33 @@ class InAppMessageBodyConfigRestJson1Serializer }) { final result$ = []; final InAppMessageBodyConfig(:alignment, :body, :textColor) = object; - result$.addAll([ - 'Alignment', - serializers.serialize( - alignment, - specifiedType: const FullType(Alignment), - ), - 'Body', - serializers.serialize(body, specifiedType: const FullType(String)), - 'TextColor', - serializers.serialize(textColor, specifiedType: const FullType(String)), - ]); + if (alignment != null) { + result$ + ..add('Alignment') + ..add( + serializers.serialize( + alignment, + specifiedType: const FullType(Alignment), + ), + ); + } + if (body != null) { + result$ + ..add('Body') + ..add( + serializers.serialize(body, specifiedType: const FullType(String)), + ); + } + if (textColor != null) { + result$ + ..add('TextColor') + ..add( + serializers.serialize( + textColor, + specifiedType: const FullType(String), + ), + ); + } return result$; } } diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_body_config.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_body_config.g.dart index c5eaa044fa8..0fc6308d54b 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_body_config.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_body_config.g.dart @@ -8,21 +8,18 @@ part of 'in_app_message_body_config.dart'; class _$InAppMessageBodyConfig extends InAppMessageBodyConfig { @override - final Alignment alignment; + final Alignment? alignment; @override - final String body; + final String? body; @override - final String textColor; + final String? textColor; factory _$InAppMessageBodyConfig([ void Function(InAppMessageBodyConfigBuilder)? updates, ]) => (InAppMessageBodyConfigBuilder()..update(updates))._build(); - _$InAppMessageBodyConfig._({ - required this.alignment, - required this.body, - required this.textColor, - }) : super._(); + _$InAppMessageBodyConfig._({this.alignment, this.body, this.textColor}) + : super._(); @override InAppMessageBodyConfig rebuild( void Function(InAppMessageBodyConfigBuilder) updates, @@ -98,21 +95,9 @@ class InAppMessageBodyConfigBuilder final _$result = _$v ?? _$InAppMessageBodyConfig._( - alignment: BuiltValueNullFieldError.checkNotNull( - alignment, - r'InAppMessageBodyConfig', - 'alignment', - ), - body: BuiltValueNullFieldError.checkNotNull( - body, - r'InAppMessageBodyConfig', - 'body', - ), - textColor: BuiltValueNullFieldError.checkNotNull( - textColor, - r'InAppMessageBodyConfig', - 'textColor', - ), + alignment: alignment, + body: body, + textColor: textColor, ); replace(_$result); return _$result; diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_button.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_button.dart index e02ea3ef549..cc7d29a96e0 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_button.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_button.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.in_app_message_button; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -55,6 +55,7 @@ abstract class InAppMessageButton OverrideButtonConfiguration? get web; @override List get props => [android, defaultConfig, ios, web]; + @override String toString() { final helper = newBuiltValueToStringHelper('InAppMessageButton') @@ -72,10 +73,12 @@ class InAppMessageButtonRestJson1Serializer @override Iterable get types => const [InAppMessageButton, _$InAppMessageButton]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override InAppMessageButton deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_campaign.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_campaign.dart index f56017a7d7e..200f22e0481 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_campaign.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_campaign.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.in_app_message_campaign; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -84,6 +84,7 @@ abstract class InAppMessageCampaign totalCap, treatmentId, ]; + @override String toString() { final helper = newBuiltValueToStringHelper('InAppMessageCampaign') @@ -109,10 +110,12 @@ class InAppMessageCampaignRestJson1Serializer InAppMessageCampaign, _$InAppMessageCampaign, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override InAppMessageCampaign deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_content.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_content.dart index 783f32bd4e9..847794e41f9 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_content.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_content.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.in_app_message_content; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -73,6 +73,7 @@ abstract class InAppMessageContent primaryBtn, secondaryBtn, ]; + @override String toString() { final helper = newBuiltValueToStringHelper('InAppMessageContent') @@ -95,10 +96,12 @@ class InAppMessageContentRestJson1Serializer InAppMessageContent, _$InAppMessageContent, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override InAppMessageContent deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_header_config.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_header_config.dart index 552b93090ec..365c7be3560 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_header_config.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_header_config.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.in_app_message_header_config; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -18,9 +18,9 @@ abstract class InAppMessageHeaderConfig Built { /// Text config for Message Header. factory InAppMessageHeaderConfig({ - required Alignment alignment, - required String header, - required String textColor, + Alignment? alignment, + String? header, + String? textColor, }) { return _$InAppMessageHeaderConfig._( alignment: alignment, @@ -40,15 +40,16 @@ abstract class InAppMessageHeaderConfig serializers = [InAppMessageHeaderConfigRestJson1Serializer()]; /// The alignment of the text. Valid values: LEFT, CENTER, RIGHT. - Alignment get alignment; + Alignment? get alignment; /// Message Header. - String get header; + String? get header; /// The text color. - String get textColor; + String? get textColor; @override List get props => [alignment, header, textColor]; + @override String toString() { final helper = newBuiltValueToStringHelper('InAppMessageHeaderConfig') @@ -69,10 +70,12 @@ class InAppMessageHeaderConfigRestJson1Serializer InAppMessageHeaderConfig, _$InAppMessageHeaderConfig, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override InAppMessageHeaderConfig deserialize( Serializers serializers, @@ -124,17 +127,33 @@ class InAppMessageHeaderConfigRestJson1Serializer }) { final result$ = []; final InAppMessageHeaderConfig(:alignment, :header, :textColor) = object; - result$.addAll([ - 'Alignment', - serializers.serialize( - alignment, - specifiedType: const FullType(Alignment), - ), - 'Header', - serializers.serialize(header, specifiedType: const FullType(String)), - 'TextColor', - serializers.serialize(textColor, specifiedType: const FullType(String)), - ]); + if (alignment != null) { + result$ + ..add('Alignment') + ..add( + serializers.serialize( + alignment, + specifiedType: const FullType(Alignment), + ), + ); + } + if (header != null) { + result$ + ..add('Header') + ..add( + serializers.serialize(header, specifiedType: const FullType(String)), + ); + } + if (textColor != null) { + result$ + ..add('TextColor') + ..add( + serializers.serialize( + textColor, + specifiedType: const FullType(String), + ), + ); + } return result$; } } diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_header_config.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_header_config.g.dart index 2168dea245e..cede3f2815a 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_header_config.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_message_header_config.g.dart @@ -8,21 +8,18 @@ part of 'in_app_message_header_config.dart'; class _$InAppMessageHeaderConfig extends InAppMessageHeaderConfig { @override - final Alignment alignment; + final Alignment? alignment; @override - final String header; + final String? header; @override - final String textColor; + final String? textColor; factory _$InAppMessageHeaderConfig([ void Function(InAppMessageHeaderConfigBuilder)? updates, ]) => (InAppMessageHeaderConfigBuilder()..update(updates))._build(); - _$InAppMessageHeaderConfig._({ - required this.alignment, - required this.header, - required this.textColor, - }) : super._(); + _$InAppMessageHeaderConfig._({this.alignment, this.header, this.textColor}) + : super._(); @override InAppMessageHeaderConfig rebuild( void Function(InAppMessageHeaderConfigBuilder) updates, @@ -99,21 +96,9 @@ class InAppMessageHeaderConfigBuilder final _$result = _$v ?? _$InAppMessageHeaderConfig._( - alignment: BuiltValueNullFieldError.checkNotNull( - alignment, - r'InAppMessageHeaderConfig', - 'alignment', - ), - header: BuiltValueNullFieldError.checkNotNull( - header, - r'InAppMessageHeaderConfig', - 'header', - ), - textColor: BuiltValueNullFieldError.checkNotNull( - textColor, - r'InAppMessageHeaderConfig', - 'textColor', - ), + alignment: alignment, + header: header, + textColor: textColor, ); replace(_$result); return _$result; diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_messages_response.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_messages_response.dart index 67270201bdf..6779aa48aaf 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_messages_response.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/in_app_messages_response.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.in_app_messages_response; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -42,6 +42,7 @@ abstract class InAppMessagesResponse _i2.BuiltList? get inAppMessageCampaigns; @override List get props => [inAppMessageCampaigns]; + @override String toString() { final helper = newBuiltValueToStringHelper('InAppMessagesResponse') @@ -60,10 +61,12 @@ class InAppMessagesResponseRestJson1Serializer InAppMessagesResponse, _$InAppMessagesResponse, ]; + @override Iterable<_i3.ShapeId> get supportedProtocols => const [ _i3.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override InAppMessagesResponse deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/internal_server_error_exception.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/internal_server_error_exception.dart index 0eaf2640f7e..366f04a68be 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/internal_server_error_exception.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/internal_server_error_exception.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.internal_server_error_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -56,18 +56,23 @@ abstract class InternalServerErrorException namespace: 'com.amazonaws.pinpoint', shape: 'InternalServerErrorException', ); + @override _i2.RetryConfig? get retryConfig => null; + @override @BuiltValueField(compare: false) int get statusCode => 500; + @override @BuiltValueField(compare: false) Map? get headers; @override Exception? get underlyingException => null; + @override List get props => [message, requestId]; + @override String toString() { final helper = newBuiltValueToStringHelper('InternalServerErrorException') @@ -87,10 +92,12 @@ class InternalServerErrorExceptionRestJson1Serializer InternalServerErrorException, _$InternalServerErrorException, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override InternalServerErrorException deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/item_response.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/item_response.dart index 00183deb7db..a51eba0d0f6 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/item_response.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/item_response.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.item_response; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -47,6 +47,7 @@ abstract class ItemResponse _i2.BuiltMap? get eventsItemResponse; @override List get props => [endpointItemResponse, eventsItemResponse]; + @override String toString() { final helper = newBuiltValueToStringHelper('ItemResponse') @@ -62,10 +63,12 @@ class ItemResponseRestJson1Serializer @override Iterable get types => const [ItemResponse, _$ItemResponse]; + @override Iterable<_i3.ShapeId> get supportedProtocols => const [ _i3.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override ItemResponse deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/layout.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/layout.dart index 16aeb26b706..98ca3262331 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/layout.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/layout.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.layout; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/message_body.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/message_body.dart index d66c0b1e73b..34a272cdd40 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/message_body.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/message_body.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.message_body; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -36,6 +36,7 @@ abstract class MessageBody String? get requestId; @override List get props => [message, requestId]; + @override String toString() { final helper = newBuiltValueToStringHelper('MessageBody') @@ -51,10 +52,12 @@ class MessageBodyRestJson1Serializer @override Iterable get types => const [MessageBody, _$MessageBody]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override MessageBody deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/method_not_allowed_exception.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/method_not_allowed_exception.dart index 4f847c888a7..4c05ef2770c 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/method_not_allowed_exception.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/method_not_allowed_exception.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.method_not_allowed_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -53,18 +53,23 @@ abstract class MethodNotAllowedException namespace: 'com.amazonaws.pinpoint', shape: 'MethodNotAllowedException', ); + @override _i2.RetryConfig? get retryConfig => null; + @override @BuiltValueField(compare: false) int get statusCode => 405; + @override @BuiltValueField(compare: false) Map? get headers; @override Exception? get underlyingException => null; + @override List get props => [message, requestId]; + @override String toString() { final helper = newBuiltValueToStringHelper('MethodNotAllowedException') @@ -84,10 +89,12 @@ class MethodNotAllowedExceptionRestJson1Serializer MethodNotAllowedException, _$MethodNotAllowedException, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override MethodNotAllowedException deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/metric_dimension.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/metric_dimension.dart index e336fc91a0c..5667ca177dc 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/metric_dimension.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/metric_dimension.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.metric_dimension; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -15,10 +15,7 @@ abstract class MetricDimension with _i1.AWSEquatable implements Built { /// Specifies metric-based criteria for including or excluding endpoints from a segment. These criteria derive from custom metrics that you define for endpoints. - factory MetricDimension({ - required String comparisonOperator, - required double value, - }) { + factory MetricDimension({String? comparisonOperator, double? value}) { return _$MetricDimension._( comparisonOperator: comparisonOperator, value: value, @@ -37,12 +34,13 @@ abstract class MetricDimension ]; /// The operator to use when comparing metric values. Valid values are: GREATER\_THAN, LESS\_THAN, GREATER\_THAN\_OR\_EQUAL, LESS\_THAN\_OR\_EQUAL, and EQUAL. - String get comparisonOperator; + String? get comparisonOperator; /// The value to compare. - double get value; + double? get value; @override List get props => [comparisonOperator, value]; + @override String toString() { final helper = newBuiltValueToStringHelper('MetricDimension') @@ -58,10 +56,12 @@ class MetricDimensionRestJson1Serializer @override Iterable get types => const [MetricDimension, _$MetricDimension]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override MetricDimension deserialize( Serializers serializers, @@ -106,15 +106,23 @@ class MetricDimensionRestJson1Serializer }) { final result$ = []; final MetricDimension(:comparisonOperator, :value) = object; - result$.addAll([ - 'ComparisonOperator', - serializers.serialize( - comparisonOperator, - specifiedType: const FullType(String), - ), - 'Value', - serializers.serialize(value, specifiedType: const FullType(double)), - ]); + if (comparisonOperator != null) { + result$ + ..add('ComparisonOperator') + ..add( + serializers.serialize( + comparisonOperator, + specifiedType: const FullType(String), + ), + ); + } + if (value != null) { + result$ + ..add('Value') + ..add( + serializers.serialize(value, specifiedType: const FullType(double)), + ); + } return result$; } } diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/metric_dimension.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/metric_dimension.g.dart index 38f05d86ade..e8ec9138d0d 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/metric_dimension.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/metric_dimension.g.dart @@ -8,15 +8,14 @@ part of 'metric_dimension.dart'; class _$MetricDimension extends MetricDimension { @override - final String comparisonOperator; + final String? comparisonOperator; @override - final double value; + final double? value; factory _$MetricDimension([void Function(MetricDimensionBuilder)? updates]) => (MetricDimensionBuilder()..update(updates))._build(); - _$MetricDimension._({required this.comparisonOperator, required this.value}) - : super._(); + _$MetricDimension._({this.comparisonOperator, this.value}) : super._(); @override MetricDimension rebuild(void Function(MetricDimensionBuilder) updates) => (toBuilder()..update(updates)).build(); @@ -84,16 +83,8 @@ class MetricDimensionBuilder final _$result = _$v ?? _$MetricDimension._( - comparisonOperator: BuiltValueNullFieldError.checkNotNull( - comparisonOperator, - r'MetricDimension', - 'comparisonOperator', - ), - value: BuiltValueNullFieldError.checkNotNull( - value, - r'MetricDimension', - 'value', - ), + comparisonOperator: comparisonOperator, + value: value, ); replace(_$result); return _$result; diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/not_found_exception.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/not_found_exception.dart index b9f799c1f91..1ebd0474a5c 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/not_found_exception.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/not_found_exception.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.not_found_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -51,18 +51,23 @@ abstract class NotFoundException namespace: 'com.amazonaws.pinpoint', shape: 'NotFoundException', ); + @override _i2.RetryConfig? get retryConfig => null; + @override @BuiltValueField(compare: false) int get statusCode => 404; + @override @BuiltValueField(compare: false) Map? get headers; @override Exception? get underlyingException => null; + @override List get props => [message, requestId]; + @override String toString() { final helper = newBuiltValueToStringHelper('NotFoundException') @@ -78,10 +83,12 @@ class NotFoundExceptionRestJson1Serializer @override Iterable get types => const [NotFoundException, _$NotFoundException]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override NotFoundException deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/override_button_configuration.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/override_button_configuration.dart index 2ddeede813d..376464e6c79 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/override_button_configuration.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/override_button_configuration.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.override_button_configuration; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -18,7 +18,7 @@ abstract class OverrideButtonConfiguration Built { /// Override button configuration. factory OverrideButtonConfiguration({ - required ButtonAction buttonAction, + ButtonAction? buttonAction, String? link, }) { return _$OverrideButtonConfiguration._( @@ -38,12 +38,13 @@ abstract class OverrideButtonConfiguration serializers = [OverrideButtonConfigurationRestJson1Serializer()]; /// Action triggered by the button. - ButtonAction get buttonAction; + ButtonAction? get buttonAction; /// Button destination. String? get link; @override List get props => [buttonAction, link]; + @override String toString() { final helper = newBuiltValueToStringHelper('OverrideButtonConfiguration') @@ -63,10 +64,12 @@ class OverrideButtonConfigurationRestJson1Serializer OverrideButtonConfiguration, _$OverrideButtonConfiguration, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override OverrideButtonConfiguration deserialize( Serializers serializers, @@ -111,13 +114,16 @@ class OverrideButtonConfigurationRestJson1Serializer }) { final result$ = []; final OverrideButtonConfiguration(:buttonAction, :link) = object; - result$.addAll([ - 'ButtonAction', - serializers.serialize( - buttonAction, - specifiedType: const FullType(ButtonAction), - ), - ]); + if (buttonAction != null) { + result$ + ..add('ButtonAction') + ..add( + serializers.serialize( + buttonAction, + specifiedType: const FullType(ButtonAction), + ), + ); + } if (link != null) { result$ ..add('Link') diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/override_button_configuration.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/override_button_configuration.g.dart index 88975e577f6..64aee2f3b03 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/override_button_configuration.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/override_button_configuration.g.dart @@ -8,7 +8,7 @@ part of 'override_button_configuration.dart'; class _$OverrideButtonConfiguration extends OverrideButtonConfiguration { @override - final ButtonAction buttonAction; + final ButtonAction? buttonAction; @override final String? link; @@ -16,8 +16,7 @@ class _$OverrideButtonConfiguration extends OverrideButtonConfiguration { void Function(OverrideButtonConfigurationBuilder)? updates, ]) => (OverrideButtonConfigurationBuilder()..update(updates))._build(); - _$OverrideButtonConfiguration._({required this.buttonAction, this.link}) - : super._(); + _$OverrideButtonConfiguration._({this.buttonAction, this.link}) : super._(); @override OverrideButtonConfiguration rebuild( void Function(OverrideButtonConfigurationBuilder) updates, @@ -90,14 +89,7 @@ class OverrideButtonConfigurationBuilder _$OverrideButtonConfiguration _build() { final _$result = _$v ?? - _$OverrideButtonConfiguration._( - buttonAction: BuiltValueNullFieldError.checkNotNull( - buttonAction, - r'OverrideButtonConfiguration', - 'buttonAction', - ), - link: link, - ); + _$OverrideButtonConfiguration._(buttonAction: buttonAction, link: link); replace(_$result); return _$result; } diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/payload_too_large_exception.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/payload_too_large_exception.dart index f4cd6280e9f..9245509baf2 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/payload_too_large_exception.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/payload_too_large_exception.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.payload_too_large_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -50,18 +50,23 @@ abstract class PayloadTooLargeException namespace: 'com.amazonaws.pinpoint', shape: 'PayloadTooLargeException', ); + @override _i2.RetryConfig? get retryConfig => null; + @override @BuiltValueField(compare: false) int get statusCode => 413; + @override @BuiltValueField(compare: false) Map? get headers; @override Exception? get underlyingException => null; + @override List get props => [message, requestId]; + @override String toString() { final helper = newBuiltValueToStringHelper('PayloadTooLargeException') @@ -81,10 +86,12 @@ class PayloadTooLargeExceptionRestJson1Serializer PayloadTooLargeException, _$PayloadTooLargeException, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override PayloadTooLargeException deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/public_endpoint.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/public_endpoint.dart index 560edf8ee3f..056ae1abcb9 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/public_endpoint.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/public_endpoint.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.public_endpoint; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -106,6 +106,7 @@ abstract class PublicEndpoint requestId, user, ]; + @override String toString() { final helper = newBuiltValueToStringHelper('PublicEndpoint') @@ -130,10 +131,12 @@ class PublicEndpointRestJson1Serializer @override Iterable get types => const [PublicEndpoint, _$PublicEndpoint]; + @override Iterable<_i3.ShapeId> get supportedProtocols => const [ _i3.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override PublicEndpoint deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/put_events_request.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/put_events_request.dart index 417833207ae..6bbd978cd28 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/put_events_request.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/put_events_request.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.put_events_request; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -18,7 +18,7 @@ abstract class PutEventsRequest _i1.HasPayload { factory PutEventsRequest({ required String applicationId, - required EventsRequest eventsRequest, + EventsRequest? eventsRequest, }) { return _$PutEventsRequest._( applicationId: applicationId, @@ -33,17 +33,19 @@ abstract class PutEventsRequest const PutEventsRequest._(); factory PutEventsRequest.fromRequest( - EventsRequest payload, + EventsRequest? payload, _i2.AWSBaseHttpRequest request, { Map labels = const {}, }) => PutEventsRequest.build((b) { - b.eventsRequest.replace(payload); + if (payload != null) { + b.eventsRequest.replace(payload); + } if (labels['applicationId'] != null) { b.applicationId = labels['applicationId']!; } }); - static const List<_i1.SmithySerializer> serializers = [ + static const List<_i1.SmithySerializer> serializers = [ PutEventsRequestRestJson1Serializer(), ]; @@ -51,7 +53,7 @@ abstract class PutEventsRequest String get applicationId; /// Specifies a batch of events to process. - EventsRequest get eventsRequest; + EventsRequest? get eventsRequest; @override String labelFor(String key) { switch (key) { @@ -62,9 +64,11 @@ abstract class PutEventsRequest } @override - EventsRequest getPayload() => eventsRequest; + EventsRequest? getPayload() => eventsRequest ?? EventsRequest(); + @override List get props => [applicationId, eventsRequest]; + @override String toString() { final helper = newBuiltValueToStringHelper('PutEventsRequest') @@ -80,10 +84,12 @@ class PutEventsRequestRestJson1Serializer @override Iterable get types => const [PutEventsRequest, _$PutEventsRequest]; + @override Iterable<_i1.ShapeId> get supportedProtocols => const [ _i1.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override EventsRequest deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/put_events_request.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/put_events_request.g.dart index 08a8f0ecd0f..2efa8f8a91a 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/put_events_request.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/put_events_request.g.dart @@ -10,16 +10,14 @@ class _$PutEventsRequest extends PutEventsRequest { @override final String applicationId; @override - final EventsRequest eventsRequest; + final EventsRequest? eventsRequest; factory _$PutEventsRequest([ void Function(PutEventsRequestBuilder)? updates, ]) => (PutEventsRequestBuilder()..update(updates))._build(); - _$PutEventsRequest._({ - required this.applicationId, - required this.eventsRequest, - }) : super._(); + _$PutEventsRequest._({required this.applicationId, this.eventsRequest}) + : super._(); @override PutEventsRequest rebuild(void Function(PutEventsRequestBuilder) updates) => (toBuilder()..update(updates)).build(); @@ -67,7 +65,7 @@ class PutEventsRequestBuilder final $v = _$v; if ($v != null) { _applicationId = $v.applicationId; - _eventsRequest = $v.eventsRequest.toBuilder(); + _eventsRequest = $v.eventsRequest?.toBuilder(); _$v = null; } return this; @@ -97,13 +95,13 @@ class PutEventsRequestBuilder r'PutEventsRequest', 'applicationId', ), - eventsRequest: eventsRequest.build(), + eventsRequest: _eventsRequest?.build(), ); } catch (_) { late String _$failedField; try { _$failedField = 'eventsRequest'; - eventsRequest.build(); + _eventsRequest?.build(); } catch (e) { throw BuiltValueNestedFieldError( r'PutEventsRequest', diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/put_events_response.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/put_events_response.dart index 45bb6fa59e5..f474585a4a2 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/put_events_response.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/put_events_response.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.put_events_response; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -16,7 +16,7 @@ abstract class PutEventsResponse implements Built, _i2.HasPayload { - factory PutEventsResponse({required EventsResponse eventsResponse}) { + factory PutEventsResponse({EventsResponse? eventsResponse}) { return _$PutEventsResponse._(eventsResponse: eventsResponse); } @@ -28,22 +28,26 @@ abstract class PutEventsResponse /// Constructs a [PutEventsResponse] from a [payload] and [response]. factory PutEventsResponse.fromResponse( - EventsResponse payload, + EventsResponse? payload, _i1.AWSBaseHttpResponse response, ) => PutEventsResponse.build((b) { - b.eventsResponse.replace(payload); + if (payload != null) { + b.eventsResponse.replace(payload); + } }); - static const List<_i2.SmithySerializer> serializers = [ + static const List<_i2.SmithySerializer> serializers = [ PutEventsResponseRestJson1Serializer(), ]; /// Provides information about endpoints and the events that they're associated with. - EventsResponse get eventsResponse; + EventsResponse? get eventsResponse; @override - EventsResponse getPayload() => eventsResponse; + EventsResponse? getPayload() => eventsResponse ?? EventsResponse(); + @override List get props => [eventsResponse]; + @override String toString() { final helper = newBuiltValueToStringHelper('PutEventsResponse') @@ -58,10 +62,12 @@ class PutEventsResponseRestJson1Serializer @override Iterable get types => const [PutEventsResponse, _$PutEventsResponse]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override EventsResponse deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/put_events_response.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/put_events_response.g.dart index 07658cb1a93..c82d2e35bdb 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/put_events_response.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/put_events_response.g.dart @@ -8,13 +8,13 @@ part of 'put_events_response.dart'; class _$PutEventsResponse extends PutEventsResponse { @override - final EventsResponse eventsResponse; + final EventsResponse? eventsResponse; factory _$PutEventsResponse([ void Function(PutEventsResponseBuilder)? updates, ]) => (PutEventsResponseBuilder()..update(updates))._build(); - _$PutEventsResponse._({required this.eventsResponse}) : super._(); + _$PutEventsResponse._({this.eventsResponse}) : super._(); @override PutEventsResponse rebuild(void Function(PutEventsResponseBuilder) updates) => (toBuilder()..update(updates)).build(); @@ -53,7 +53,7 @@ class PutEventsResponseBuilder PutEventsResponseBuilder get _$this { final $v = _$v; if ($v != null) { - _eventsResponse = $v.eventsResponse.toBuilder(); + _eventsResponse = $v.eventsResponse?.toBuilder(); _$v = null; } return this; @@ -76,12 +76,13 @@ class PutEventsResponseBuilder _$PutEventsResponse _$result; try { _$result = - _$v ?? _$PutEventsResponse._(eventsResponse: eventsResponse.build()); + _$v ?? + _$PutEventsResponse._(eventsResponse: _eventsResponse?.build()); } catch (_) { late String _$failedField; try { _$failedField = 'eventsResponse'; - eventsResponse.build(); + _eventsResponse?.build(); } catch (e) { throw BuiltValueNestedFieldError( r'PutEventsResponse', diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/quiet_time.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/quiet_time.dart index f4dd81eaeb7..8b335d41ed5 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/quiet_time.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/quiet_time.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.quiet_time; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -36,6 +36,7 @@ abstract class QuietTime String? get start; @override List get props => [end, start]; + @override String toString() { final helper = newBuiltValueToStringHelper('QuietTime') @@ -51,10 +52,12 @@ class QuietTimeRestJson1Serializer @override Iterable get types => const [QuietTime, _$QuietTime]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override QuietTime deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/session.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/session.dart index d0ebf789715..a3fa5025275 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/session.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/session.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.session; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -17,8 +17,8 @@ abstract class Session /// Provides information about a session. factory Session({ int? duration, - required String id, - required String startTimestamp, + String? id, + String? startTimestamp, String? stopTimestamp, }) { return _$Session._( @@ -42,15 +42,16 @@ abstract class Session int? get duration; /// The unique identifier for the session. - String get id; + String? get id; /// The date and time when the session began. - String get startTimestamp; + String? get startTimestamp; /// The date and time when the session ended. String? get stopTimestamp; @override List get props => [duration, id, startTimestamp, stopTimestamp]; + @override String toString() { final helper = newBuiltValueToStringHelper('Session') @@ -68,10 +69,12 @@ class SessionRestJson1Serializer @override Iterable get types => const [Session, _$Session]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override Session deserialize( Serializers serializers, @@ -130,15 +133,6 @@ class SessionRestJson1Serializer }) { final result$ = []; final Session(:duration, :id, :startTimestamp, :stopTimestamp) = object; - result$.addAll([ - 'Id', - serializers.serialize(id, specifiedType: const FullType(String)), - 'StartTimestamp', - serializers.serialize( - startTimestamp, - specifiedType: const FullType(String), - ), - ]); if (duration != null) { result$ ..add('Duration') @@ -146,6 +140,21 @@ class SessionRestJson1Serializer serializers.serialize(duration, specifiedType: const FullType(int)), ); } + if (id != null) { + result$ + ..add('Id') + ..add(serializers.serialize(id, specifiedType: const FullType(String))); + } + if (startTimestamp != null) { + result$ + ..add('StartTimestamp') + ..add( + serializers.serialize( + startTimestamp, + specifiedType: const FullType(String), + ), + ); + } if (stopTimestamp != null) { result$ ..add('StopTimestamp') diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/session.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/session.g.dart index a01d1b77880..b7d6ae9f6e6 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/session.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/session.g.dart @@ -10,21 +10,17 @@ class _$Session extends Session { @override final int? duration; @override - final String id; + final String? id; @override - final String startTimestamp; + final String? startTimestamp; @override final String? stopTimestamp; factory _$Session([void Function(SessionBuilder)? updates]) => (SessionBuilder()..update(updates))._build(); - _$Session._({ - this.duration, - required this.id, - required this.startTimestamp, - this.stopTimestamp, - }) : super._(); + _$Session._({this.duration, this.id, this.startTimestamp, this.stopTimestamp}) + : super._(); @override Session rebuild(void Function(SessionBuilder) updates) => (toBuilder()..update(updates)).build(); @@ -107,12 +103,8 @@ class SessionBuilder implements Builder { _$v ?? _$Session._( duration: duration, - id: BuiltValueNullFieldError.checkNotNull(id, r'Session', 'id'), - startTimestamp: BuiltValueNullFieldError.checkNotNull( - startTimestamp, - r'Session', - 'startTimestamp', - ), + id: id, + startTimestamp: startTimestamp, stopTimestamp: stopTimestamp, ); replace(_$result); diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/set_dimension.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/set_dimension.dart index e7cfd5c41ef..afb05877f3c 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/set_dimension.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/set_dimension.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.set_dimension; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -17,13 +17,10 @@ abstract class SetDimension with _i1.AWSEquatable implements Built { /// Specifies the dimension type and values for a segment dimension. - factory SetDimension({ - DimensionType? dimensionType, - required List values, - }) { + factory SetDimension({DimensionType? dimensionType, List? values}) { return _$SetDimension._( dimensionType: dimensionType, - values: _i2.BuiltList(values), + values: values == null ? null : _i2.BuiltList(values), ); } @@ -41,9 +38,10 @@ abstract class SetDimension DimensionType? get dimensionType; /// The criteria values to use for the segment dimension. Depending on the value of the DimensionType property, endpoints are included or excluded from the segment if their values match the criteria values. - _i2.BuiltList get values; + _i2.BuiltList? get values; @override List get props => [dimensionType, values]; + @override String toString() { final helper = newBuiltValueToStringHelper('SetDimension') @@ -59,10 +57,12 @@ class SetDimensionRestJson1Serializer @override Iterable get types => const [SetDimension, _$SetDimension]; + @override Iterable<_i3.ShapeId> get supportedProtocols => const [ _i3.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override SetDimension deserialize( Serializers serializers, @@ -110,13 +110,6 @@ class SetDimensionRestJson1Serializer }) { final result$ = []; final SetDimension(:dimensionType, :values) = object; - result$.addAll([ - 'Values', - serializers.serialize( - values, - specifiedType: const FullType(_i2.BuiltList, [FullType(String)]), - ), - ]); if (dimensionType != null) { result$ ..add('DimensionType') @@ -127,6 +120,16 @@ class SetDimensionRestJson1Serializer ), ); } + if (values != null) { + result$ + ..add('Values') + ..add( + serializers.serialize( + values, + specifiedType: const FullType(_i2.BuiltList, [FullType(String)]), + ), + ); + } return result$; } } diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/set_dimension.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/set_dimension.g.dart index 49e69e70f14..2efb6d1bddd 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/set_dimension.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/set_dimension.g.dart @@ -10,12 +10,12 @@ class _$SetDimension extends SetDimension { @override final DimensionType? dimensionType; @override - final _i2.BuiltList values; + final _i2.BuiltList? values; factory _$SetDimension([void Function(SetDimensionBuilder)? updates]) => (SetDimensionBuilder()..update(updates))._build(); - _$SetDimension._({this.dimensionType, required this.values}) : super._(); + _$SetDimension._({this.dimensionType, this.values}) : super._(); @override SetDimension rebuild(void Function(SetDimensionBuilder) updates) => (toBuilder()..update(updates)).build(); @@ -61,7 +61,7 @@ class SetDimensionBuilder final $v = _$v; if ($v != null) { _dimensionType = $v.dimensionType; - _values = $v.values.toBuilder(); + _values = $v.values?.toBuilder(); _$v = null; } return this; @@ -87,13 +87,13 @@ class SetDimensionBuilder _$v ?? _$SetDimension._( dimensionType: dimensionType, - values: values.build(), + values: _values?.build(), ); } catch (_) { late String _$failedField; try { _$failedField = 'values'; - values.build(); + _values?.build(); } catch (e) { throw BuiltValueNestedFieldError( r'SetDimension', diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/too_many_requests_exception.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/too_many_requests_exception.dart index 1b216aabb2e..939a805fe5d 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/too_many_requests_exception.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/too_many_requests_exception.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.too_many_requests_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -50,18 +50,23 @@ abstract class TooManyRequestsException namespace: 'com.amazonaws.pinpoint', shape: 'TooManyRequestsException', ); + @override _i2.RetryConfig? get retryConfig => null; + @override @BuiltValueField(compare: false) int get statusCode => 429; + @override @BuiltValueField(compare: false) Map? get headers; @override Exception? get underlyingException => null; + @override List get props => [message, requestId]; + @override String toString() { final helper = newBuiltValueToStringHelper('TooManyRequestsException') @@ -81,10 +86,12 @@ class TooManyRequestsExceptionRestJson1Serializer TooManyRequestsException, _$TooManyRequestsException, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override TooManyRequestsException deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoint_request.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoint_request.dart index 5cb36b3092b..5aa01cb7e11 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoint_request.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoint_request.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.update_endpoint_request; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -19,7 +19,7 @@ abstract class UpdateEndpointRequest factory UpdateEndpointRequest({ required String applicationId, required String endpointId, - required EndpointRequest endpointRequest, + EndpointRequest? endpointRequest, }) { return _$UpdateEndpointRequest._( applicationId: applicationId, @@ -35,11 +35,13 @@ abstract class UpdateEndpointRequest const UpdateEndpointRequest._(); factory UpdateEndpointRequest.fromRequest( - EndpointRequest payload, + EndpointRequest? payload, _i2.AWSBaseHttpRequest request, { Map labels = const {}, }) => UpdateEndpointRequest.build((b) { - b.endpointRequest.replace(payload); + if (payload != null) { + b.endpointRequest.replace(payload); + } if (labels['applicationId'] != null) { b.applicationId = labels['applicationId']!; } @@ -48,18 +50,18 @@ abstract class UpdateEndpointRequest } }); - static const List<_i1.SmithySerializer> serializers = [ + static const List<_i1.SmithySerializer> serializers = [ UpdateEndpointRequestRestJson1Serializer(), ]; /// The unique identifier for the application. This identifier is displayed as the **Project ID** on the Amazon Pinpoint console. String get applicationId; - /// The unique identifier for the endpoint. + /// The case insensitive unique identifier for the endpoint. The identifier can't contain `$`, `{` or `}`. String get endpointId; /// Specifies the channel type and other settings for an endpoint. - EndpointRequest get endpointRequest; + EndpointRequest? get endpointRequest; @override String labelFor(String key) { switch (key) { @@ -72,9 +74,11 @@ abstract class UpdateEndpointRequest } @override - EndpointRequest getPayload() => endpointRequest; + EndpointRequest? getPayload() => endpointRequest ?? EndpointRequest(); + @override List get props => [applicationId, endpointId, endpointRequest]; + @override String toString() { final helper = newBuiltValueToStringHelper('UpdateEndpointRequest') @@ -95,10 +99,12 @@ class UpdateEndpointRequestRestJson1Serializer UpdateEndpointRequest, _$UpdateEndpointRequest, ]; + @override Iterable<_i1.ShapeId> get supportedProtocols => const [ _i1.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override EndpointRequest deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoint_request.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoint_request.g.dart index d4c1ec5776c..979e50128c1 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoint_request.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoint_request.g.dart @@ -12,7 +12,7 @@ class _$UpdateEndpointRequest extends UpdateEndpointRequest { @override final String endpointId; @override - final EndpointRequest endpointRequest; + final EndpointRequest? endpointRequest; factory _$UpdateEndpointRequest([ void Function(UpdateEndpointRequestBuilder)? updates, @@ -21,7 +21,7 @@ class _$UpdateEndpointRequest extends UpdateEndpointRequest { _$UpdateEndpointRequest._({ required this.applicationId, required this.endpointId, - required this.endpointRequest, + this.endpointRequest, }) : super._(); @override UpdateEndpointRequest rebuild( @@ -78,7 +78,7 @@ class UpdateEndpointRequestBuilder if ($v != null) { _applicationId = $v.applicationId; _endpointId = $v.endpointId; - _endpointRequest = $v.endpointRequest.toBuilder(); + _endpointRequest = $v.endpointRequest?.toBuilder(); _$v = null; } return this; @@ -113,13 +113,13 @@ class UpdateEndpointRequestBuilder r'UpdateEndpointRequest', 'endpointId', ), - endpointRequest: endpointRequest.build(), + endpointRequest: _endpointRequest?.build(), ); } catch (_) { late String _$failedField; try { _$failedField = 'endpointRequest'; - endpointRequest.build(); + _endpointRequest?.build(); } catch (e) { throw BuiltValueNestedFieldError( r'UpdateEndpointRequest', diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoint_response.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoint_response.dart index 3a52920627e..c06381b782d 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoint_response.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoint_response.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.update_endpoint_response; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -16,7 +16,7 @@ abstract class UpdateEndpointResponse implements Built, _i2.HasPayload { - factory UpdateEndpointResponse({required MessageBody messageBody}) { + factory UpdateEndpointResponse({MessageBody? messageBody}) { return _$UpdateEndpointResponse._(messageBody: messageBody); } @@ -28,22 +28,26 @@ abstract class UpdateEndpointResponse /// Constructs a [UpdateEndpointResponse] from a [payload] and [response]. factory UpdateEndpointResponse.fromResponse( - MessageBody payload, + MessageBody? payload, _i1.AWSBaseHttpResponse response, ) => UpdateEndpointResponse.build((b) { - b.messageBody.replace(payload); + if (payload != null) { + b.messageBody.replace(payload); + } }); - static const List<_i2.SmithySerializer> serializers = [ + static const List<_i2.SmithySerializer> serializers = [ UpdateEndpointResponseRestJson1Serializer(), ]; /// Provides information about an API request or response. - MessageBody get messageBody; + MessageBody? get messageBody; @override - MessageBody getPayload() => messageBody; + MessageBody? getPayload() => messageBody ?? MessageBody(); + @override List get props => [messageBody]; + @override String toString() { final helper = newBuiltValueToStringHelper('UpdateEndpointResponse') @@ -62,10 +66,12 @@ class UpdateEndpointResponseRestJson1Serializer UpdateEndpointResponse, _$UpdateEndpointResponse, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override MessageBody deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoint_response.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoint_response.g.dart index 835f7f3e182..28e3432b5a7 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoint_response.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoint_response.g.dart @@ -8,13 +8,13 @@ part of 'update_endpoint_response.dart'; class _$UpdateEndpointResponse extends UpdateEndpointResponse { @override - final MessageBody messageBody; + final MessageBody? messageBody; factory _$UpdateEndpointResponse([ void Function(UpdateEndpointResponseBuilder)? updates, ]) => (UpdateEndpointResponseBuilder()..update(updates))._build(); - _$UpdateEndpointResponse._({required this.messageBody}) : super._(); + _$UpdateEndpointResponse._({this.messageBody}) : super._(); @override UpdateEndpointResponse rebuild( void Function(UpdateEndpointResponseBuilder) updates, @@ -54,7 +54,7 @@ class UpdateEndpointResponseBuilder UpdateEndpointResponseBuilder get _$this { final $v = _$v; if ($v != null) { - _messageBody = $v.messageBody.toBuilder(); + _messageBody = $v.messageBody?.toBuilder(); _$v = null; } return this; @@ -77,12 +77,12 @@ class UpdateEndpointResponseBuilder _$UpdateEndpointResponse _$result; try { _$result = - _$v ?? _$UpdateEndpointResponse._(messageBody: messageBody.build()); + _$v ?? _$UpdateEndpointResponse._(messageBody: _messageBody?.build()); } catch (_) { late String _$failedField; try { _$failedField = 'messageBody'; - messageBody.build(); + _messageBody?.build(); } catch (e) { throw BuiltValueNestedFieldError( r'UpdateEndpointResponse', diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoints_batch_request.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoints_batch_request.dart index 46a3e0eead7..772ae6ebfd3 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoints_batch_request.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoints_batch_request.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.update_endpoints_batch_request; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -20,7 +20,7 @@ abstract class UpdateEndpointsBatchRequest _i1.HasPayload { factory UpdateEndpointsBatchRequest({ required String applicationId, - required EndpointBatchRequest endpointBatchRequest, + EndpointBatchRequest? endpointBatchRequest, }) { return _$UpdateEndpointsBatchRequest._( applicationId: applicationId, @@ -35,17 +35,19 @@ abstract class UpdateEndpointsBatchRequest const UpdateEndpointsBatchRequest._(); factory UpdateEndpointsBatchRequest.fromRequest( - EndpointBatchRequest payload, + EndpointBatchRequest? payload, _i2.AWSBaseHttpRequest request, { Map labels = const {}, }) => UpdateEndpointsBatchRequest.build((b) { - b.endpointBatchRequest.replace(payload); + if (payload != null) { + b.endpointBatchRequest.replace(payload); + } if (labels['applicationId'] != null) { b.applicationId = labels['applicationId']!; } }); - static const List<_i1.SmithySerializer> serializers = [ + static const List<_i1.SmithySerializer> serializers = [ UpdateEndpointsBatchRequestRestJson1Serializer(), ]; @@ -53,7 +55,7 @@ abstract class UpdateEndpointsBatchRequest String get applicationId; /// Specifies a batch of endpoints to create or update and the settings and attributes to set or change for each endpoint. - EndpointBatchRequest get endpointBatchRequest; + EndpointBatchRequest? get endpointBatchRequest; @override String labelFor(String key) { switch (key) { @@ -64,9 +66,12 @@ abstract class UpdateEndpointsBatchRequest } @override - EndpointBatchRequest getPayload() => endpointBatchRequest; + EndpointBatchRequest? getPayload() => + endpointBatchRequest ?? EndpointBatchRequest(); + @override List get props => [applicationId, endpointBatchRequest]; + @override String toString() { final helper = newBuiltValueToStringHelper('UpdateEndpointsBatchRequest') @@ -86,10 +91,12 @@ class UpdateEndpointsBatchRequestRestJson1Serializer UpdateEndpointsBatchRequest, _$UpdateEndpointsBatchRequest, ]; + @override Iterable<_i1.ShapeId> get supportedProtocols => const [ _i1.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override EndpointBatchRequest deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoints_batch_request.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoints_batch_request.g.dart index 760f49b0ff8..8c89fe38c9d 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoints_batch_request.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoints_batch_request.g.dart @@ -10,7 +10,7 @@ class _$UpdateEndpointsBatchRequest extends UpdateEndpointsBatchRequest { @override final String applicationId; @override - final EndpointBatchRequest endpointBatchRequest; + final EndpointBatchRequest? endpointBatchRequest; factory _$UpdateEndpointsBatchRequest([ void Function(UpdateEndpointsBatchRequestBuilder)? updates, @@ -18,7 +18,7 @@ class _$UpdateEndpointsBatchRequest extends UpdateEndpointsBatchRequest { _$UpdateEndpointsBatchRequest._({ required this.applicationId, - required this.endpointBatchRequest, + this.endpointBatchRequest, }) : super._(); @override UpdateEndpointsBatchRequest rebuild( @@ -72,7 +72,7 @@ class UpdateEndpointsBatchRequestBuilder final $v = _$v; if ($v != null) { _applicationId = $v.applicationId; - _endpointBatchRequest = $v.endpointBatchRequest.toBuilder(); + _endpointBatchRequest = $v.endpointBatchRequest?.toBuilder(); _$v = null; } return this; @@ -102,13 +102,13 @@ class UpdateEndpointsBatchRequestBuilder r'UpdateEndpointsBatchRequest', 'applicationId', ), - endpointBatchRequest: endpointBatchRequest.build(), + endpointBatchRequest: _endpointBatchRequest?.build(), ); } catch (_) { late String _$failedField; try { _$failedField = 'endpointBatchRequest'; - endpointBatchRequest.build(); + _endpointBatchRequest?.build(); } catch (e) { throw BuiltValueNestedFieldError( r'UpdateEndpointsBatchRequest', diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoints_batch_response.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoints_batch_response.dart index 64a8b4e6b99..d70fbf355af 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoints_batch_response.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoints_batch_response.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.model.update_endpoints_batch_response; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -19,7 +19,7 @@ abstract class UpdateEndpointsBatchResponse UpdateEndpointsBatchResponseBuilder >, _i2.HasPayload { - factory UpdateEndpointsBatchResponse({required MessageBody messageBody}) { + factory UpdateEndpointsBatchResponse({MessageBody? messageBody}) { return _$UpdateEndpointsBatchResponse._(messageBody: messageBody); } @@ -31,22 +31,26 @@ abstract class UpdateEndpointsBatchResponse /// Constructs a [UpdateEndpointsBatchResponse] from a [payload] and [response]. factory UpdateEndpointsBatchResponse.fromResponse( - MessageBody payload, + MessageBody? payload, _i1.AWSBaseHttpResponse response, ) => UpdateEndpointsBatchResponse.build((b) { - b.messageBody.replace(payload); + if (payload != null) { + b.messageBody.replace(payload); + } }); - static const List<_i2.SmithySerializer> serializers = [ + static const List<_i2.SmithySerializer> serializers = [ UpdateEndpointsBatchResponseRestJson1Serializer(), ]; /// Provides information about an API request or response. - MessageBody get messageBody; + MessageBody? get messageBody; @override - MessageBody getPayload() => messageBody; + MessageBody? getPayload() => messageBody ?? MessageBody(); + @override List get props => [messageBody]; + @override String toString() { final helper = newBuiltValueToStringHelper('UpdateEndpointsBatchResponse') @@ -65,10 +69,12 @@ class UpdateEndpointsBatchResponseRestJson1Serializer UpdateEndpointsBatchResponse, _$UpdateEndpointsBatchResponse, ]; + @override Iterable<_i2.ShapeId> get supportedProtocols => const [ _i2.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), ]; + @override MessageBody deserialize( Serializers serializers, diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoints_batch_response.g.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoints_batch_response.g.dart index 23b4441b6d6..e17cd57089c 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoints_batch_response.g.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/model/update_endpoints_batch_response.g.dart @@ -8,13 +8,13 @@ part of 'update_endpoints_batch_response.dart'; class _$UpdateEndpointsBatchResponse extends UpdateEndpointsBatchResponse { @override - final MessageBody messageBody; + final MessageBody? messageBody; factory _$UpdateEndpointsBatchResponse([ void Function(UpdateEndpointsBatchResponseBuilder)? updates, ]) => (UpdateEndpointsBatchResponseBuilder()..update(updates))._build(); - _$UpdateEndpointsBatchResponse._({required this.messageBody}) : super._(); + _$UpdateEndpointsBatchResponse._({this.messageBody}) : super._(); @override UpdateEndpointsBatchResponse rebuild( void Function(UpdateEndpointsBatchResponseBuilder) updates, @@ -59,7 +59,7 @@ class UpdateEndpointsBatchResponseBuilder UpdateEndpointsBatchResponseBuilder get _$this { final $v = _$v; if ($v != null) { - _messageBody = $v.messageBody.toBuilder(); + _messageBody = $v.messageBody?.toBuilder(); _$v = null; } return this; @@ -83,12 +83,12 @@ class UpdateEndpointsBatchResponseBuilder try { _$result = _$v ?? - _$UpdateEndpointsBatchResponse._(messageBody: messageBody.build()); + _$UpdateEndpointsBatchResponse._(messageBody: _messageBody?.build()); } catch (_) { late String _$failedField; try { _$failedField = 'messageBody'; - messageBody.build(); + _messageBody?.build(); } catch (e) { throw BuiltValueNestedFieldError( r'UpdateEndpointsBatchResponse', diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/get_endpoint_operation.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/get_endpoint_operation.dart index b3fe377955b..4875c7b4577 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/get_endpoint_operation.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/get_endpoint_operation.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.operation.get_endpoint_operation; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -68,7 +68,7 @@ class GetEndpointOperation service: _i4.AWSService.pinpoint, credentialsProvider: _credentialsProvider, ), - const _i1.WithUserAgent('aws-sdk-dart/0.3.1'), + const _i1.WithUserAgent('aws-sdk-dart/0.3.2'), const _i3.WithSdkInvocationId(), const _i3.WithSdkRequest(), ] + @@ -99,13 +99,16 @@ class GetEndpointOperation b.method = 'GET'; b.path = r'/v1/apps/{ApplicationId}/endpoints/{EndpointId}'; }); + @override int successCode([GetEndpointResponse? output]) => 200; + @override GetEndpointResponse buildOutput( - EndpointResponse payload, + EndpointResponse? payload, _i4.AWSBaseHttpResponse response, ) => GetEndpointResponse.fromResponse(payload, response); + @override List<_i1.SmithyError> get errorTypes => const [ _i1.SmithyError( @@ -179,14 +182,19 @@ class GetEndpointOperation builder: TooManyRequestsException.fromResponse, ), ]; + @override String get runtimeTypeName => 'GetEndpoint'; + @override _i3.AWSRetryer get retryer => _i3.AWSRetryer(); + @override Uri get baseUri => _baseUri ?? endpoint.uri; + @override _i1.Endpoint get endpoint => _awsEndpoint.endpoint; + @override _i1.SmithyOperation run( GetEndpointRequest input, { diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/get_in_app_messages_operation.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/get_in_app_messages_operation.dart index e9980908339..a44f379b2de 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/get_in_app_messages_operation.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/get_in_app_messages_operation.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.operation.get_in_app_messages_operation; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -68,7 +68,7 @@ class GetInAppMessagesOperation service: _i4.AWSService.pinpoint, credentialsProvider: _credentialsProvider, ), - const _i1.WithUserAgent('aws-sdk-dart/0.3.1'), + const _i1.WithUserAgent('aws-sdk-dart/0.3.2'), const _i3.WithSdkInvocationId(), const _i3.WithSdkRequest(), ] + @@ -100,13 +100,16 @@ class GetInAppMessagesOperation b.path = r'/v1/apps/{ApplicationId}/endpoints/{EndpointId}/inappmessages'; }); + @override int successCode([GetInAppMessagesResponse? output]) => 200; + @override GetInAppMessagesResponse buildOutput( - InAppMessagesResponse payload, + InAppMessagesResponse? payload, _i4.AWSBaseHttpResponse response, ) => GetInAppMessagesResponse.fromResponse(payload, response); + @override List<_i1.SmithyError> get errorTypes => const [ _i1.SmithyError( @@ -180,14 +183,19 @@ class GetInAppMessagesOperation builder: TooManyRequestsException.fromResponse, ), ]; + @override String get runtimeTypeName => 'GetInAppMessages'; + @override _i3.AWSRetryer get retryer => _i3.AWSRetryer(); + @override Uri get baseUri => _baseUri ?? endpoint.uri; + @override _i1.Endpoint get endpoint => _awsEndpoint.endpoint; + @override _i1.SmithyOperation run( GetInAppMessagesRequest input, { diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/put_events_operation.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/put_events_operation.dart index 2694633fbc6..fb893a72688 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/put_events_operation.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/put_events_operation.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.operation.put_events_operation; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -68,7 +68,7 @@ class PutEventsOperation service: _i4.AWSService.pinpoint, credentialsProvider: _credentialsProvider, ), - const _i1.WithUserAgent('aws-sdk-dart/0.3.1'), + const _i1.WithUserAgent('aws-sdk-dart/0.3.2'), const _i3.WithSdkInvocationId(), const _i3.WithSdkRequest(), ] + @@ -98,13 +98,16 @@ class PutEventsOperation b.method = 'POST'; b.path = r'/v1/apps/{ApplicationId}/events'; }); + @override int successCode([PutEventsResponse? output]) => 202; + @override PutEventsResponse buildOutput( - EventsResponse payload, + EventsResponse? payload, _i4.AWSBaseHttpResponse response, ) => PutEventsResponse.fromResponse(payload, response); + @override List<_i1.SmithyError> get errorTypes => const [ _i1.SmithyError( @@ -178,14 +181,19 @@ class PutEventsOperation builder: TooManyRequestsException.fromResponse, ), ]; + @override String get runtimeTypeName => 'PutEvents'; + @override _i3.AWSRetryer get retryer => _i3.AWSRetryer(); + @override Uri get baseUri => _baseUri ?? endpoint.uri; + @override _i1.Endpoint get endpoint => _awsEndpoint.endpoint; + @override _i1.SmithyOperation run( PutEventsRequest input, { diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/update_endpoint_operation.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/update_endpoint_operation.dart index e05c3f6fb16..d9708d1a708 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/update_endpoint_operation.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/update_endpoint_operation.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.operation.update_endpoint_operation; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -68,7 +68,7 @@ class UpdateEndpointOperation service: _i4.AWSService.pinpoint, credentialsProvider: _credentialsProvider, ), - const _i1.WithUserAgent('aws-sdk-dart/0.3.1'), + const _i1.WithUserAgent('aws-sdk-dart/0.3.2'), const _i3.WithSdkInvocationId(), const _i3.WithSdkRequest(), ] + @@ -99,13 +99,16 @@ class UpdateEndpointOperation b.method = 'PUT'; b.path = r'/v1/apps/{ApplicationId}/endpoints/{EndpointId}'; }); + @override int successCode([UpdateEndpointResponse? output]) => 202; + @override UpdateEndpointResponse buildOutput( - MessageBody payload, + MessageBody? payload, _i4.AWSBaseHttpResponse response, ) => UpdateEndpointResponse.fromResponse(payload, response); + @override List<_i1.SmithyError> get errorTypes => const [ _i1.SmithyError( @@ -179,14 +182,19 @@ class UpdateEndpointOperation builder: TooManyRequestsException.fromResponse, ), ]; + @override String get runtimeTypeName => 'UpdateEndpoint'; + @override _i3.AWSRetryer get retryer => _i3.AWSRetryer(); + @override Uri get baseUri => _baseUri ?? endpoint.uri; + @override _i1.Endpoint get endpoint => _awsEndpoint.endpoint; + @override _i1.SmithyOperation run( UpdateEndpointRequest input, { diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/update_endpoints_batch_operation.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/update_endpoints_batch_operation.dart index 586810a003f..a6d05924ec8 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/update_endpoints_batch_operation.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/operation/update_endpoints_batch_operation.dart @@ -1,5 +1,5 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas +// Generated with smithy-dart 0.3.2. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.operation.update_endpoints_batch_operation; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -68,7 +68,7 @@ class UpdateEndpointsBatchOperation service: _i4.AWSService.pinpoint, credentialsProvider: _credentialsProvider, ), - const _i1.WithUserAgent('aws-sdk-dart/0.3.1'), + const _i1.WithUserAgent('aws-sdk-dart/0.3.2'), const _i3.WithSdkInvocationId(), const _i3.WithSdkRequest(), ] + @@ -99,13 +99,16 @@ class UpdateEndpointsBatchOperation b.method = 'PUT'; b.path = r'/v1/apps/{ApplicationId}/endpoints'; }); + @override int successCode([UpdateEndpointsBatchResponse? output]) => 202; + @override UpdateEndpointsBatchResponse buildOutput( - MessageBody payload, + MessageBody? payload, _i4.AWSBaseHttpResponse response, ) => UpdateEndpointsBatchResponse.fromResponse(payload, response); + @override List<_i1.SmithyError> get errorTypes => const [ _i1.SmithyError( @@ -179,14 +182,19 @@ class UpdateEndpointsBatchOperation builder: TooManyRequestsException.fromResponse, ), ]; + @override String get runtimeTypeName => 'UpdateEndpointsBatch'; + @override _i3.AWSRetryer get retryer => _i3.AWSRetryer(); + @override Uri get baseUri => _baseUri ?? endpoint.uri; + @override _i1.Endpoint get endpoint => _awsEndpoint.endpoint; + @override _i1.SmithyOperation run( UpdateEndpointsBatchRequest input, { diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/pinpoint_client.dart b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/pinpoint_client.dart index 73432c04527..5713ffda62e 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/pinpoint_client.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/lib/src/sdk/src/pinpoint/pinpoint_client.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.2. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas,unnecessary_library_name +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,unnecessary_library_name library amplify_analytics_pinpoint_dart.pinpoint.pinpoint_client; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml index bb4832610a2..ddf458214b7 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml +++ b/packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: amplify_secure_storage_dart: ">=0.5.8 <0.6.0" aws_common: ">=0.7.11 <0.8.0" aws_signature_v4: ">=0.6.9 <0.7.0" - built_collection: ^5.0.0 + built_collection: ^5.1.1 built_value: ^8.10.1 collection: ^1.18.0 drift: ^2.25.0 @@ -28,11 +28,11 @@ dependencies: dev_dependencies: amplify_lints: ">=3.1.4 <3.2.0" - build_runner: ^2.4.9 + build_runner: ^2.4.15 build_test: ^3.1.1 build_verify: ^3.0.0 build_version: ^2.1.1 - build_web_compilers: ^4.0.0 + build_web_compilers: ^4.1.4 built_value_generator: ^8.10.1 drift_dev: ^2.25.1 mocktail: ^1.0.0 diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/test/endpoint_client_test.dart b/packages/analytics/amplify_analytics_pinpoint_dart/test/endpoint_client_test.dart index e28c76f1a73..43ba8e545de 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/test/endpoint_client_test.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/test/endpoint_client_test.dart @@ -83,32 +83,32 @@ void main() { final endpointRequest = captured.endpointRequest; - expect(endpointRequest.attributes, isEmpty); - expect(endpointRequest.metrics, isEmpty); + expect(endpointRequest?.attributes, isEmpty); + expect(endpointRequest?.metrics, isEmpty); // Demographics - expect(endpointRequest.demographic, isNotNull); - final demographic = endpointRequest.demographic!; - - expect(demographic.appVersion, mockDeviceContextInfo.appVersion); - expect(demographic.locale, mockDeviceContextInfo.locale); - expect(demographic.make, mockDeviceContextInfo.make); - expect(demographic.model, mockDeviceContextInfo.model); - expect(demographic.modelVersion, mockDeviceContextInfo.modelVersion); - expect(demographic.platform, mockDeviceContextInfo.platform!.name); + expect(endpointRequest?.demographic, isNotNull); + final demographic = endpointRequest?.demographic; + + expect(demographic?.appVersion, mockDeviceContextInfo.appVersion); + expect(demographic?.locale, mockDeviceContextInfo.locale); + expect(demographic?.make, mockDeviceContextInfo.make); + expect(demographic?.model, mockDeviceContextInfo.model); + expect(demographic?.modelVersion, mockDeviceContextInfo.modelVersion); + expect(demographic?.platform, mockDeviceContextInfo.platform!.name); expect( - demographic.platformVersion, + demographic?.platformVersion, mockDeviceContextInfo.platformVersion, ); - expect(demographic.timezone, mockDeviceContextInfo.timezone); + expect(demographic?.timezone, mockDeviceContextInfo.timezone); // Location - expect(endpointRequest.location, isNotNull); - final location = endpointRequest.location!; + expect(endpointRequest?.location, isNotNull); + final location = endpointRequest?.location; - expect(location.country, mockDeviceContextInfo.countryCode); - expect(location.latitude, isNull); - expect(location.longitude, isNull); + expect(location?.country, mockDeviceContextInfo.countryCode); + expect(location?.latitude, isNull); + expect(location?.longitude, isNull); }); test( @@ -142,9 +142,9 @@ void main() { final endpointRequest = captured.endpointRequest; - expect(endpointRequest.channelType, channelType); - expect(endpointRequest.address, address); - expect(endpointRequest.optOut, optOut); + expect(endpointRequest?.channelType, channelType); + expect(endpointRequest?.address, address); + expect(endpointRequest?.optOut, optOut); }, ); @@ -173,32 +173,32 @@ void main() { final endpointRequest = captured.endpointRequest; // Attributes - expect(endpointRequest.attributes, isNotNull); - final attributes = endpointRequest.attributes!; + expect(endpointRequest?.attributes, isNotNull); + final attributes = endpointRequest?.attributes; - expect(attributes['name'], [userProfile.name]); - expect(attributes['email'], [userProfile.email]); - expect(attributes['plan'], [userProfile.plan]); - expect(attributes[stringProperty], [stringValue]); - expect(attributes[boolProperty], [boolValue.toString()]); + expect(attributes?['name'], [userProfile.name]); + expect(attributes?['email'], [userProfile.email]); + expect(attributes?['plan'], [userProfile.plan]); + expect(attributes?[stringProperty], [stringValue]); + expect(attributes?[boolProperty], [boolValue.toString()]); // Metrics - expect(endpointRequest.metrics, isNotNull); - final metrics = endpointRequest.metrics!; + expect(endpointRequest?.metrics, isNotNull); + final metrics = endpointRequest?.metrics; - expect(metrics[doubleProperty], doubleValue); - expect(metrics[intProperty], intValue); + expect(metrics?[doubleProperty], doubleValue); + expect(metrics?[intProperty], intValue); // Location - expect(endpointRequest.location, isNotNull); - final location = endpointRequest.location!; - - expect(location.city, userLocation.city); - expect(location.country, userLocation.country); - expect(location.latitude, userLocation.latitude); - expect(location.longitude, userLocation.longitude); - expect(location.postalCode, userLocation.postalCode); - expect(location.region, userLocation.region); + expect(endpointRequest?.location, isNotNull); + final location = endpointRequest?.location; + + expect(location?.city, userLocation.city); + expect(location?.country, userLocation.country); + expect(location?.latitude, userLocation.latitude); + expect(location?.longitude, userLocation.longitude); + expect(location?.postalCode, userLocation.postalCode); + expect(location?.region, userLocation.region); }); test('getPublicEndpoint returns an Endpoint with all set values', () async { diff --git a/packages/analytics/amplify_analytics_pinpoint_dart/test/event_client_test.dart b/packages/analytics/amplify_analytics_pinpoint_dart/test/event_client_test.dart index 739b5a2bef5..f29ce3ef8a1 100644 --- a/packages/analytics/amplify_analytics_pinpoint_dart/test/event_client_test.dart +++ b/packages/analytics/amplify_analytics_pinpoint_dart/test/event_client_test.dart @@ -168,37 +168,37 @@ void main() { expect(captured.applicationId, pinpointAppId); - final batchItem = captured.eventsRequest.batchItem; + final batchItem = captured.eventsRequest?.batchItem; - expect(batchItem[mockEndpointId], isNotNull); - final eventsBatch = batchItem[mockEndpointId]!; + expect(batchItem?[mockEndpointId], isNotNull); + final eventsBatch = batchItem?[mockEndpointId]; - expect(eventsBatch.endpoint, endpointClient.getPublicEndpoint()); + expect(eventsBatch?.endpoint, endpointClient.getPublicEndpoint()); // Event - expect(eventsBatch.events.length, 1); - expect(eventsBatch.events['0'], isNotNull); - final event = eventsBatch.events['0']!; + expect(eventsBatch?.events?.length, 1); + expect(eventsBatch?.events?['0'], isNotNull); + final event = eventsBatch?.events?['0']; - expect(event.appPackageName, mockDeviceContextInfo.appPackageName); - expect(event.appTitle, mockDeviceContextInfo.appName); - expect(event.appVersionCode, mockDeviceContextInfo.appVersion); - expect(event.eventType, eventType); + expect(event?.appPackageName, mockDeviceContextInfo.appPackageName); + expect(event?.appTitle, mockDeviceContextInfo.appName); + expect(event?.appVersionCode, mockDeviceContextInfo.appVersion); + expect(event?.eventType, eventType); - expect(event.clientSdkVersion, packageVersion); - expect(event.sdkName, 'amplify-flutter'); - expect(event.session, session); + expect(event?.clientSdkVersion, packageVersion); + expect(event?.sdkName, 'amplify-flutter'); + expect(event?.session, session); // Attributes - expect(event.attributes, isNotNull); - final attributes = event.attributes!; + expect(event?.attributes, isNotNull); + final attributes = event?.attributes; - expect(attributes[stringProperty], stringValue); - expect(attributes[boolProperty], boolValue.toString()); + expect(attributes?[stringProperty], stringValue); + expect(attributes?[boolProperty], boolValue.toString()); // Metrics - expect(event.metrics, isNotNull); - final metrics = event.metrics!; + expect(event?.metrics, isNotNull); + final metrics = event!.metrics!; expect(metrics[doubleProperty], doubleValue); expect(metrics[intProperty], intValue); @@ -217,29 +217,29 @@ void main() { verify(() => pinpointClient.putEvents(captureAny())).captured[0] as PutEventsRequest; - final batchItem = captured.eventsRequest.batchItem; + final batchItem = captured.eventsRequest?.batchItem; - expect(batchItem[mockEndpointId], isNotNull); - final eventsBatch = batchItem[mockEndpointId]!; + expect(batchItem?[mockEndpointId], isNotNull); + final eventsBatch = batchItem?[mockEndpointId]; // Event - expect(eventsBatch.events.length, 1); - expect(eventsBatch.events['0'], isNotNull); - final event = eventsBatch.events['0']!; + expect(eventsBatch?.events?.length, 1); + expect(eventsBatch?.events?['0'], isNotNull); + final event = eventsBatch?.events?['0']; // Attributes - expect(event.attributes, isNotNull); - final attributes = event.attributes!; + expect(event?.attributes, isNotNull); + final attributes = event?.attributes; - expect(attributes[stringProperty], stringValue); - expect(attributes[boolProperty], boolValue.toString()); + expect(attributes?[stringProperty], stringValue); + expect(attributes?[boolProperty], boolValue.toString()); // Metrics - expect(event.metrics, isNotNull); - final metrics = event.metrics!; + expect(event?.metrics, isNotNull); + final metrics = event?.metrics; - expect(metrics[doubleProperty], doubleValue); - expect(metrics[intProperty], intValue); + expect(metrics?[doubleProperty], doubleValue); + expect(metrics?[intProperty], intValue); }, ); @@ -261,18 +261,18 @@ void main() { verify(() => pinpointClient.putEvents(captureAny())).captured[0] as PutEventsRequest; - final batchItem = captured.eventsRequest.batchItem; + final batchItem = captured.eventsRequest?.batchItem; - expect(batchItem[mockEndpointId], isNotNull); - final eventsBatch = batchItem[mockEndpointId]!; + expect(batchItem?[mockEndpointId], isNotNull); + final eventsBatch = batchItem?[mockEndpointId]; // Event - expect(eventsBatch.events.length, 1); - expect(eventsBatch.events['0'], isNotNull); - final event = eventsBatch.events['0']!; + expect(eventsBatch?.events?.length, 1); + expect(eventsBatch?.events?['0'], isNotNull); + final event = eventsBatch?.events?['0']; - expect(event.attributes, isEmpty); - expect(event.metrics, isEmpty); + expect(event?.attributes, isEmpty); + expect(event?.metrics, isEmpty); }, ); diff --git a/packages/api/amplify_api/pubspec.yaml b/packages/api/amplify_api/pubspec.yaml index f4c1232879a..9a13cd64d20 100644 --- a/packages/api/amplify_api/pubspec.yaml +++ b/packages/api/amplify_api/pubspec.yaml @@ -32,7 +32,7 @@ dev_dependencies: amplify_lints: ">=3.1.4 <3.2.0" amplify_test: path: ../../test/amplify_test - build_runner: ^2.4.9 + build_runner: ^2.4.15 connectivity_plus_platform_interface: ^2.0.1 flutter_test: sdk: flutter diff --git a/packages/api/amplify_api_dart/pubspec.yaml b/packages/api/amplify_api_dart/pubspec.yaml index ae0b69eda1f..d06a7855af8 100644 --- a/packages/api/amplify_api_dart/pubspec.yaml +++ b/packages/api/amplify_api_dart/pubspec.yaml @@ -22,8 +22,8 @@ dependencies: dev_dependencies: amplify_lints: ">=3.1.4 <3.2.0" aws_signature_v4: ">=0.6.9 <0.7.0" - build_runner: ^2.4.9 + build_runner: ^2.4.15 build_test: ^3.1.1 - build_web_compilers: ^4.0.0 + build_web_compilers: ^4.1.4 stream_channel: ^2.1.0 test: ^1.22.1 diff --git a/packages/auth/amplify_auth_cognito/Makefile b/packages/auth/amplify_auth_cognito/Makefile index 4a7c74cb187..5bdafc2646c 100644 --- a/packages/auth/amplify_auth_cognito/Makefile +++ b/packages/auth/amplify_auth_cognito/Makefile @@ -1,4 +1,4 @@ .PHONY: pigeons pigeons: dart run pigeon --input pigeons/native_auth_plugin.dart - dart format --fix lib/src/native_auth_plugin.g.dart + dart format lib/src/native_auth_plugin.g.dart diff --git a/packages/auth/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/pigeons/NativeAuthPluginBindingsPigeon.kt b/packages/auth/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/pigeons/NativeAuthPluginBindingsPigeon.kt index 04bd4aac7e3..82a6a6df467 100644 --- a/packages/auth/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/pigeons/NativeAuthPluginBindingsPigeon.kt +++ b/packages/auth/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/pigeons/NativeAuthPluginBindingsPigeon.kt @@ -1,7 +1,7 @@ // // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v25.5.0), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon @file:Suppress("UNCHECKED_CAST", "ArrayInDataClass") @@ -63,7 +63,7 @@ private object NativeAuthPluginBindingsPigeonPigeonUtils { } if (a is Map<*, *> && b is Map<*, *>) { return a.size == b.size && a.all { - (b as Map).containsKey(it.key) && + (b as Map).contains(it.key) && deepEquals(it.value, b[it.key]) } } diff --git a/packages/auth/amplify_auth_cognito/darwin/Classes/pigeons/messages.g.swift b/packages/auth/amplify_auth_cognito/darwin/Classes/pigeons/messages.g.swift index 2fb52166535..a8b9caa1c02 100644 --- a/packages/auth/amplify_auth_cognito/darwin/Classes/pigeons/messages.g.swift +++ b/packages/auth/amplify_auth_cognito/darwin/Classes/pigeons/messages.g.swift @@ -1,7 +1,7 @@ // // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v25.5.0), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon import Foundation diff --git a/packages/auth/amplify_auth_cognito/example/integration_test/native_auth_bridge_test.dart b/packages/auth/amplify_auth_cognito/example/integration_test/native_auth_bridge_test.dart index 2965fab3359..4315ce00139 100644 --- a/packages/auth/amplify_auth_cognito/example/integration_test/native_auth_bridge_test.dart +++ b/packages/auth/amplify_auth_cognito/example/integration_test/native_auth_bridge_test.dart @@ -53,65 +53,16 @@ void main() { dependencyManager ..addInstance( MockNativeAuthBridge( - signInWithUrl: expectAsync1((argSignInOut) async { - expect( - argSignInOut.url, - contains(mockConfig.auth?.oauth?.domain), - ); - expect(argSignInOut.callbackurlscheme, testUrlScheme); - expect(argSignInOut.preferprivatesession, isFalse); - expect(argSignInOut.browserPackageName, browserPackage); - return {'code': 'code', 'state': 'state'}; - }), - ), - ) - ..addInstance>( - const MockDispatcher(), - ); - await platform.signIn(options: options); - }); - - asyncTest('signInWithUrl with OIDC parameters', (_) async { - const options = CognitoSignInWithWebUIPluginOptions( - isPreferPrivateSession: false, - browserPackageName: browserPackage, - nonce: 'nonce', - language: 'en', - loginHint: 'username', - prompt: [ - CognitoSignInWithWebUIPrompt.login, - CognitoSignInWithWebUIPrompt.consent, - ], - resource: 'myapp://', - ); - dependencyManager - ..addInstance( - MockNativeAuthBridge( - signInWithUrl: expectAsync1((argSignInOut) async { - expect( - argSignInOut.url, - contains(mockConfig.auth?.oauth?.domain), - ); - expect(argSignInOut.callbackurlscheme, testUrlScheme); - expect(argSignInOut.preferprivatesession, isFalse); - expect(argSignInOut.browserPackageName, browserPackage); - expect(argSignInOut.nonce, 'nonce'); - expect(argSignInOut.language, 'en'); - expect(argSignInOut.loginHint, 'username'); - expect(argSignInOut.prompt, isNotNull); - expect( - argSignInOut.prompt?.contains( - CognitoSignInWithWebUIPrompt.login.value, - ), - isTrue, - ); - expect( - argSignInOut.prompt?.contains( - CognitoSignInWithWebUIPrompt.consent.value, - ), - isTrue, - ); - expect(argSignInOut.resource, 'myapp://'); + signInWithUrl: expectAsync4(( + argUrl, + argCallbackurlscheme, + argPreferprivatesession, + argBrowserpackagename, + ) async { + expect(argUrl, contains(mockConfig.auth?.oauth?.domain)); + expect(argCallbackurlscheme, testUrlScheme); + expect(argPreferprivatesession, isFalse); + expect(argBrowserpackagename, browserPackage); return {'code': 'code', 'state': 'state'}; }), ), @@ -130,14 +81,16 @@ void main() { dependencyManager ..addInstance( MockNativeAuthBridge( - signOutWithUrl: expectAsync1((argSignInOut) async { - expect( - argSignInOut.url, - contains(mockConfig.auth?.oauth?.domain), - ); - expect(argSignInOut.callbackurlscheme, testUrlScheme); - expect(argSignInOut.preferprivatesession, isFalse); - expect(argSignInOut.browserPackageName, browserPackage); + signOutWithUrl: expectAsync4(( + argUrl, + argCallbackurlscheme, + argPreferprivatesession, + argBrowserpackagename, + ) async { + expect(argUrl, contains(mockConfig.auth?.oauth?.domain)); + expect(argCallbackurlscheme, testUrlScheme); + expect(argPreferprivatesession, isFalse); + expect(argBrowserpackagename, browserPackage); }), ), ) @@ -150,31 +103,13 @@ void main() { ); } -class SignInOut { - SignInOut( - this.url, - this.callbackurlscheme, - this.preferprivatesession, - this.browserPackageName, - this.nonce, - this.language, - this.loginHint, - this.prompt, - this.resource, - ); - - String url = ''; - String callbackurlscheme = ''; - bool preferprivatesession = false; - String? browserPackageName; - String? nonce; - String? language; - String? loginHint; - List? prompt; - String? resource; -} - -typedef SignInOutFn = Future Function(SignInOut signInOut); +typedef SignInOutFn = + Future Function( + String argUrl, + String argCallbackurlscheme, + bool argPreferprivatesession, + String? argBrowserpackagename, + ); class MockNativeAuthBridge extends Fake implements NativeAuthBridge { MockNativeAuthBridge({ @@ -192,24 +127,12 @@ class MockNativeAuthBridge extends Fake implements NativeAuthBridge { String argCallbackurlscheme, bool argPreferprivatesession, String? argBrowserpackagename, - String? argNonce, - String? argLanguage, - String? argLoginHint, - List? argPrompt, - String? argResource, ) async { return _signInWithUrl?.call( - SignInOut( - argUrl, - argCallbackurlscheme, - argPreferprivatesession, - argBrowserpackagename, - argNonce, - argLanguage, - argLoginHint, - argPrompt, - argResource, - ), + argUrl, + argCallbackurlscheme, + argPreferprivatesession, + argBrowserpackagename, ) ?? (throw UnimplementedError()); } @@ -222,17 +145,10 @@ class MockNativeAuthBridge extends Fake implements NativeAuthBridge { String? argBrowserpackagename, ) async { return _signOutWithUrl?.call( - SignInOut( - argUrl, - argCallbackurlscheme, - argPreferprivatesession, - argBrowserpackagename, - null, - null, - null, - null, - null, - ), + argUrl, + argCallbackurlscheme, + argPreferprivatesession, + argBrowserpackagename, ) ?? (throw UnimplementedError()); } diff --git a/packages/auth/amplify_auth_cognito/example/pubspec.yaml b/packages/auth/amplify_auth_cognito/example/pubspec.yaml index 4b25594a752..58dc6683f47 100644 --- a/packages/auth/amplify_auth_cognito/example/pubspec.yaml +++ b/packages/auth/amplify_auth_cognito/example/pubspec.yaml @@ -29,7 +29,7 @@ dev_dependencies: async: ^2.10.0 aws_signature_v4: any checks: ^0.3.0 - collection: any + collection: ^1.18.0 flutter_driver: sdk: flutter flutter_test: diff --git a/packages/auth/amplify_auth_cognito/lib/src/flows/hosted_ui/hosted_ui_platform_flutter.dart b/packages/auth/amplify_auth_cognito/lib/src/flows/hosted_ui/hosted_ui_platform_flutter.dart index ed2faa2d28b..c16063c89d3 100644 --- a/packages/auth/amplify_auth_cognito/lib/src/flows/hosted_ui/hosted_ui_platform_flutter.dart +++ b/packages/auth/amplify_auth_cognito/lib/src/flows/hosted_ui/hosted_ui_platform_flutter.dart @@ -94,11 +94,6 @@ class HostedUiPlatformImpl extends io.HostedUiPlatformImpl { signInRedirectUri.scheme, options.isPreferPrivateSession, options.browserPackageName, - options.nonce, - options.language, - options.loginHint, - options.prompt?.map((obj) => obj.value).toList(), - options.resource, ); dispatcher .dispatch( diff --git a/packages/auth/amplify_auth_cognito/lib/src/native_auth_plugin.g.dart b/packages/auth/amplify_auth_cognito/lib/src/native_auth_plugin.g.dart index 463fc005a79..b873e8aa226 100644 --- a/packages/auth/amplify_auth_cognito/lib/src/native_auth_plugin.g.dart +++ b/packages/auth/amplify_auth_cognito/lib/src/native_auth_plugin.g.dart @@ -1,7 +1,7 @@ // // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v25.5.0), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers @@ -376,11 +376,6 @@ class NativeAuthBridge { String callbackUrlScheme, bool preferPrivateSession, String? browserPackageName, - String? nonce, - String? language, - String? loginHint, - List? prompt, - String? resource, ) async { final String pigeonVar_channelName = 'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signInWithUrl$pigeonVar_messageChannelSuffix'; @@ -390,18 +385,14 @@ class NativeAuthBridge { pigeonChannelCodec, binaryMessenger: pigeonVar_binaryMessenger, ); - final Future pigeonVar_sendFuture = pigeonVar_channel - .send([ - url, - callbackUrlScheme, - preferPrivateSession, - browserPackageName, - nonce, - language, - loginHint, - prompt, - resource, - ]); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [ + url, + callbackUrlScheme, + preferPrivateSession, + browserPackageName, + ], + ); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { diff --git a/packages/auth/amplify_auth_cognito/pubspec.yaml b/packages/auth/amplify_auth_cognito/pubspec.yaml index 0730ded28ba..f0ea87659de 100644 --- a/packages/auth/amplify_auth_cognito/pubspec.yaml +++ b/packages/auth/amplify_auth_cognito/pubspec.yaml @@ -38,7 +38,7 @@ dev_dependencies: amplify_lints: ">=3.1.4 <3.2.0" flutter_test: sdk: flutter - pigeon: ^25.5.0 + pigeon: ^26.0.0 flutter: plugin: diff --git a/packages/auth/amplify_auth_cognito/test/hosted_ui_platform_flutter_test.dart b/packages/auth/amplify_auth_cognito/test/hosted_ui_platform_flutter_test.dart index 260bf9e5a62..03dc293862c 100644 --- a/packages/auth/amplify_auth_cognito/test/hosted_ui_platform_flutter_test.dart +++ b/packages/auth/amplify_auth_cognito/test/hosted_ui_platform_flutter_test.dart @@ -83,11 +83,6 @@ final class ThrowingNativeBridge extends Fake implements NativeAuthBridge { String arg_callbackUrlScheme, bool arg_preferPrivateSession, String? arg_browserPackageName, - String? arg_nonce, - String? arg_language, - String? arg_loginHint, - List? arg_prompt, - String? arg_resource, ) async { throw PlatformException(code: 'CANCELLED'); } diff --git a/packages/auth/amplify_auth_cognito_dart/example/pubspec.yaml b/packages/auth/amplify_auth_cognito_dart/example/pubspec.yaml index 83022e082be..6f85ff18734 100644 --- a/packages/auth/amplify_auth_cognito_dart/example/pubspec.yaml +++ b/packages/auth/amplify_auth_cognito_dart/example/pubspec.yaml @@ -24,8 +24,8 @@ dev_dependencies: amplify_lints: path: ../../../amplify_lints browser_launcher: ^1.1.1 - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 checks: ^0.3.0 cli_script: ^0.3.0 io: ^1.0.4 diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_worker.worker.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_worker.worker.dart index fe38311ec83..6a23ec5b6e2 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_worker.worker.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/asf/asf_worker.worker.dart @@ -1,5 +1,5 @@ -// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 // ************************************************************************** // WorkerBeeGenerator diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/asf/package_info.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/asf/package_info.g.dart index 632aafab937..8d0185d5769 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/asf/package_info.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/asf/package_info.g.dart @@ -15,8 +15,8 @@ PackageInfo _$PackageInfoFromJson(Map json) => PackageInfo( Map _$PackageInfoToJson(PackageInfo instance) => { - if (instance.appName case final value?) 'app_name': value, - if (instance.version case final value?) 'version': value, - if (instance.buildNumber case final value?) 'build_number': value, - if (instance.packageName case final value?) 'package_name': value, + 'app_name': ?instance.appName, + 'version': ?instance.version, + 'build_number': ?instance.buildNumber, + 'package_name': ?instance.packageName, }; diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/device/confirm_device_worker.worker.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/device/confirm_device_worker.worker.dart index 9b66659309e..70168d8f05a 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/device/confirm_device_worker.worker.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/device/confirm_device_worker.worker.dart @@ -1,5 +1,5 @@ -// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 // ************************************************************************** // WorkerBeeGenerator diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_device_password_verifier_worker.worker.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_device_password_verifier_worker.worker.dart index c4386eb6591..c258b7a7357 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_device_password_verifier_worker.worker.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_device_password_verifier_worker.worker.dart @@ -1,5 +1,5 @@ -// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 // ************************************************************************** // WorkerBeeGenerator diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_init_worker.worker.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_init_worker.worker.dart index 3675964bfb7..8cf6f54cfaa 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_init_worker.worker.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_init_worker.worker.dart @@ -1,5 +1,5 @@ -// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 // ************************************************************************** // WorkerBeeGenerator diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_password_verifier_worker.worker.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_password_verifier_worker.worker.dart index 9bdaefdbb7c..ba4231fdbd6 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_password_verifier_worker.worker.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/srp/srp_password_verifier_worker.worker.dart @@ -1,5 +1,5 @@ -// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 // ************************************************************************** // WorkerBeeGenerator diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/jwt/src/claims.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/jwt/src/claims.g.dart index e4b17d0db5c..202c54876fe 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/jwt/src/claims.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/jwt/src/claims.g.dart @@ -19,11 +19,11 @@ JsonWebClaims _$JsonWebClaimsFromJson(Map json) => Map _$JsonWebClaimsToJson(JsonWebClaims instance) => { - if (instance.issuer case final value?) 'iss': value, - if (instance.subject case final value?) 'sub': value, - if (instance.audience case final value?) 'aud': value, - if (encodeDateTime(instance.expiration) case final value?) 'exp': value, - if (encodeDateTime(instance.notBefore) case final value?) 'nbf': value, - if (encodeDateTime(instance.issuedAt) case final value?) 'iat': value, - if (instance.jwtId case final value?) 'jti': value, + 'iss': ?instance.issuer, + 'sub': ?instance.subject, + 'aud': ?instance.audience, + 'exp': ?encodeDateTime(instance.expiration), + 'nbf': ?encodeDateTime(instance.notBefore), + 'iat': ?encodeDateTime(instance.issuedAt), + 'jti': ?instance.jwtId, }; diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/jwt/src/header.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/jwt/src/header.g.dart index f78a25c0e32..a0befa34045 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/jwt/src/header.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/jwt/src/header.g.dart @@ -31,15 +31,15 @@ JsonWebHeader _$JsonWebHeaderFromJson(Map json) => Map _$JsonWebHeaderToJson(JsonWebHeader instance) => { - if (AlgorithmX.toJson(instance.algorithm) case final value?) 'alg': value, - if (instance.jwkSetUri?.toString() case final value?) 'jku': value, - if (instance.jwk?.toJson() case final value?) 'jwk': value, - if (instance.keyId case final value?) 'kid': value, - if (instance.x509Uri?.toString() case final value?) 'x5u': value, - if (instance.x509CertChain case final value?) 'x5c': value, - if (instance.x509sha1Thumbprint case final value?) 'x5t': value, - if (instance.x509sha256Thumbprint case final value?) 'x5t#S256': value, - if (instance.type case final value?) 'typ': value, - if (instance.contentType case final value?) 'cty': value, - if (instance.critical case final value?) 'crit': value, + 'alg': ?AlgorithmX.toJson(instance.algorithm), + 'jku': ?instance.jwkSetUri?.toString(), + 'jwk': ?instance.jwk?.toJson(), + 'kid': ?instance.keyId, + 'x5u': ?instance.x509Uri?.toString(), + 'x5c': ?instance.x509CertChain, + 'x5t': ?instance.x509sha1Thumbprint, + 'x5t#S256': ?instance.x509sha256Thumbprint, + 'typ': ?instance.type, + 'cty': ?instance.contentType, + 'crit': ?instance.critical, }; diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/jwt/src/key.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/jwt/src/key.g.dart index a369f16b8f8..49200c389e3 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/jwt/src/key.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/jwt/src/key.g.dart @@ -37,37 +37,33 @@ JsonWebKey _$JsonWebKeyFromJson(Map json) => JsonWebKey( .toList(), ); -Map _$JsonWebKeyToJson( - JsonWebKey instance, -) => { - if (KeyTypeX.toJson(instance.keyType) case final value?) 'kty': value, - if (PublicKeyUseX.toJson(instance.publicKeyUse) case final value?) - 'use': value, - if (instance.keyOperations?.map((e) => _$KeyOperationEnumMap[e]!).toList() - case final value?) - 'key_ops': value, - if (AlgorithmX.toJson(instance.algorithm) case final value?) 'alg': value, - if (instance.keyId case final value?) 'kid': value, - if (instance.x509Url case final value?) 'x5u': value, - if (instance.x509CertChain case final value?) 'x5c': value, - if (instance.x509Sha1Thumbprint case final value?) 'x5t': value, - if (instance.x509Sha256Thumbprint case final value?) 'x5t#S256': value, - if (EllipticCurveX.toJson(instance.ellipticCurve) case final value?) - 'crv': value, - if (base64UrlUintEncode(instance.x) case final value?) 'x': value, - if (base64UrlUintEncode(instance.y) case final value?) 'y': value, - if (base64UrlUintEncode(instance.n) case final value?) 'n': value, - if (base64UrlUintEncode(instance.e) case final value?) 'e': value, - if (symmetricKeyToJson(instance.k) case final value?) 'k': value, - if (base64UrlUintEncode(instance.d) case final value?) 'd': value, - if (base64UrlUintEncode(instance.p) case final value?) 'p': value, - if (base64UrlUintEncode(instance.q) case final value?) 'q': value, - if (base64UrlUintEncode(instance.dp) case final value?) 'dp': value, - if (base64UrlUintEncode(instance.dq) case final value?) 'dq': value, - if (base64UrlUintEncode(instance.qi) case final value?) 'qi': value, - if (instance.otherPrimes?.map((e) => e.toJson()).toList() case final value?) - 'oth': value, -}; +Map _$JsonWebKeyToJson(JsonWebKey instance) => + { + 'kty': ?KeyTypeX.toJson(instance.keyType), + 'use': ?PublicKeyUseX.toJson(instance.publicKeyUse), + 'key_ops': ?instance.keyOperations + ?.map((e) => _$KeyOperationEnumMap[e]!) + .toList(), + 'alg': ?AlgorithmX.toJson(instance.algorithm), + 'kid': ?instance.keyId, + 'x5u': ?instance.x509Url, + 'x5c': ?instance.x509CertChain, + 'x5t': ?instance.x509Sha1Thumbprint, + 'x5t#S256': ?instance.x509Sha256Thumbprint, + 'crv': ?EllipticCurveX.toJson(instance.ellipticCurve), + 'x': ?base64UrlUintEncode(instance.x), + 'y': ?base64UrlUintEncode(instance.y), + 'n': ?base64UrlUintEncode(instance.n), + 'e': ?base64UrlUintEncode(instance.e), + 'k': ?symmetricKeyToJson(instance.k), + 'd': ?base64UrlUintEncode(instance.d), + 'p': ?base64UrlUintEncode(instance.p), + 'q': ?base64UrlUintEncode(instance.q), + 'dp': ?base64UrlUintEncode(instance.dp), + 'dq': ?base64UrlUintEncode(instance.dq), + 'qi': ?base64UrlUintEncode(instance.qi), + 'oth': ?instance.otherPrimes?.map((e) => e.toJson()).toList(), + }; const _$KeyOperationEnumMap = { KeyOperation.sign: 'sign', @@ -88,7 +84,7 @@ OtherPrime _$OtherPrimeFromJson(Map json) => OtherPrime( Map _$OtherPrimeToJson(OtherPrime instance) => { - if (base64UrlUintEncode(instance.r) case final value?) 'r': value, - if (base64UrlUintEncode(instance.d) case final value?) 'd': value, - if (base64UrlUintEncode(instance.t) case final value?) 't': value, + 'r': ?base64UrlUintEncode(instance.r), + 'd': ?base64UrlUintEncode(instance.d), + 't': ?base64UrlUintEncode(instance.t), }; diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/mfa/cognito_verify_totp_setup_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/mfa/cognito_verify_totp_setup_plugin_options.g.dart index 28d044d6846..8a226c20549 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/mfa/cognito_verify_totp_setup_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/mfa/cognito_verify_totp_setup_plugin_options.g.dart @@ -22,7 +22,4 @@ _$CognitoVerifyTotpSetupPluginOptionsFromJson(Map json) => Map _$CognitoVerifyTotpSetupPluginOptionsToJson( CognitoVerifyTotpSetupPluginOptions instance, -) => { - if (instance.friendlyDeviceName case final value?) - 'friendlyDeviceName': value, -}; +) => {'friendlyDeviceName': ?instance.friendlyDeviceName}; diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_sign_in_details.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_sign_in_details.g.dart index e8a689d6c8b..fe34ee3955c 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_sign_in_details.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/cognito_sign_in_details.g.dart @@ -52,12 +52,10 @@ Map _$CognitoSignInDetailsApiBasedToJson( CognitoSignInDetailsApiBased instance, ) => { 'username': instance.username, - if (_$JsonConverterToJson( - instance.authFlowType, - const _AuthFlowTypeSerializer().toJson, - ) - case final value?) - 'authFlowType': value, + 'authFlowType': ?_$JsonConverterToJson( + instance.authFlowType, + const _AuthFlowTypeSerializer().toJson, + ), }; Value? _$JsonConverterFromJson( @@ -85,9 +83,7 @@ CognitoSignInDetailsHostedUi _$CognitoSignInDetailsHostedUiFromJson( Map _$CognitoSignInDetailsHostedUiToJson( CognitoSignInDetailsHostedUi instance, -) => { - if (instance.provider?.toJson() case final value?) 'provider': value, -}; +) => {'provider': ?instance.provider?.toJson()}; CognitoSignInDetailsFederated _$CognitoSignInDetailsFederatedFromJson( Map json, diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_options.g.dart index 819522672d4..47efced3dc2 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_options.g.dart @@ -21,6 +21,5 @@ FederateToIdentityPoolOptions _$FederateToIdentityPoolOptionsFromJson( Map _$FederateToIdentityPoolOptionsToJson( FederateToIdentityPoolOptions instance, ) => { - if (instance.developerProvidedIdentityId case final value?) - 'developerProvidedIdentityId': value, + 'developerProvidedIdentityId': ?instance.developerProvidedIdentityId, }; diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_request.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_request.g.dart index f2d9a4c2a29..726b88c639a 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_request.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/session/federate_to_identity_pool_request.g.dart @@ -30,5 +30,5 @@ Map _$FederateToIdentityPoolRequestToJson( ) => { 'token': instance.token, 'provider': instance.provider.toJson(), - if (instance.options?.toJson() case final value?) 'options': value, + 'options': ?instance.options?.toJson(), }; diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_confirm_sign_in_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_confirm_sign_in_plugin_options.g.dart index a2756ac80e0..b61fb7f62f0 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_confirm_sign_in_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_confirm_sign_in_plugin_options.g.dart @@ -40,8 +40,7 @@ Map _$CognitoConfirmSignInPluginOptionsToJson( 'userAttributes': const CognitoUserAttributeMapConverter().toJson( instance.userAttributes, ), - if (instance.friendlyDeviceName case final value?) - 'friendlyDeviceName': value, + 'friendlyDeviceName': ?instance.friendlyDeviceName, }; Value? _$JsonConverterFromJson( diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_sign_in_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_sign_in_plugin_options.g.dart index abc80b23e9a..1be7f24ceda 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_sign_in_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_sign_in_plugin_options.g.dart @@ -29,8 +29,7 @@ CognitoSignInPluginOptions _$CognitoSignInPluginOptionsFromJson( Map _$CognitoSignInPluginOptionsToJson( CognitoSignInPluginOptions instance, ) => { - if (_$AuthenticationFlowTypeEnumMap[instance.authFlowType] case final value?) - 'authFlowType': value, + 'authFlowType': ?_$AuthenticationFlowTypeEnumMap[instance.authFlowType], 'clientMetadata': instance.clientMetadata, }; diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_sign_in_with_web_ui_plugin_options.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_sign_in_with_web_ui_plugin_options.g.dart index 610167df4a4..7fab85bdede 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_sign_in_with_web_ui_plugin_options.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/model/signin/cognito_sign_in_with_web_ui_plugin_options.g.dart @@ -40,17 +40,14 @@ Map _$CognitoSignInWithWebUIPluginOptionsToJson( CognitoSignInWithWebUIPluginOptions instance, ) => { 'isPreferPrivateSession': instance.isPreferPrivateSession, - if (instance.browserPackageName case final value?) - 'browserPackageName': value, - if (instance.nonce case final value?) 'nonce': value, - if (instance.language case final value?) 'language': value, - if (instance.loginHint case final value?) 'loginHint': value, - if (instance.prompt - ?.map((e) => _$CognitoSignInWithWebUIPromptEnumMap[e]!) - .toList() - case final value?) - 'prompt': value, - if (instance.resource case final value?) 'resource': value, + 'browserPackageName': ?instance.browserPackageName, + 'nonce': ?instance.nonce, + 'language': ?instance.language, + 'loginHint': ?instance.loginHint, + 'prompt': ?instance.prompt + ?.map((e) => _$CognitoSignInWithWebUIPromptEnumMap[e]!) + .toList(), + 'resource': ?instance.resource, }; const _$CognitoSignInWithWebUIPromptEnumMap = { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/state/state/auth_state.g.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/state/state/auth_state.g.dart index e3efd0e4c67..f095319230b 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/state/state/auth_state.g.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/state/state/auth_state.g.dart @@ -35,11 +35,8 @@ CredentialStoreData _$CredentialStoreDataFromJson(Map json) => Map _$CredentialStoreDataToJson( CredentialStoreData instance, ) => { - if (instance.identityId case final value?) 'identityId': value, - if (instance.awsCredentials?.toJson() case final value?) - 'awsCredentials': value, - if (instance.userPoolTokens?.toJson() case final value?) - 'userPoolTokens': value, - if (instance.signInDetails?.toJson() case final value?) - 'signInDetails': value, + 'identityId': ?instance.identityId, + 'awsCredentials': ?instance.awsCredentials?.toJson(), + 'userPoolTokens': ?instance.userPoolTokens?.toJson(), + 'signInDetails': ?instance.signInDetails?.toJson(), }; diff --git a/packages/auth/amplify_auth_cognito_dart/pubspec.yaml b/packages/auth/amplify_auth_cognito_dart/pubspec.yaml index ec008ced344..6a87a043633 100644 --- a/packages/auth/amplify_auth_cognito_dart/pubspec.yaml +++ b/packages/auth/amplify_auth_cognito_dart/pubspec.yaml @@ -15,12 +15,12 @@ dependencies: async: ^2.10.0 aws_common: ">=0.7.11 <0.8.0" aws_signature_v4: ">=0.6.9 <0.7.0" - built_collection: ^5.0.0 + built_collection: ^5.1.1 built_value: ^8.10.1 clock: ^1.1.1 collection: ^1.18.0 convert: ^3.0.1 - crypto: ^3.0.1 + crypto: ^3.0.7 ffi: ^2.0.2 fixnum: ^1.0.0 http: ^1.3.0 @@ -40,13 +40,13 @@ dependencies: dev_dependencies: amplify_lints: ">=3.1.4 <3.2.0" - build: ^2.3.0 - build_runner: ^2.4.9 + build: ^4.0.0 + build_runner: ^2.4.15 build_verify: ^3.0.0 - build_web_compilers: ^4.0.0 + build_web_compilers: ^4.1.4 built_value_generator: ^8.10.1 ffigen: ^9.0.0 - json_serializable: ">=6.9.4 <6.10.0" + json_serializable: ^6.11.0 mockito: ^5.0.0 smithy_codegen: path: ../../smithy/smithy_codegen diff --git a/packages/auth/amplify_auth_cognito_test/pubspec.yaml b/packages/auth/amplify_auth_cognito_test/pubspec.yaml index a7b7ee33844..ea99ea049be 100644 --- a/packages/auth/amplify_auth_cognito_test/pubspec.yaml +++ b/packages/auth/amplify_auth_cognito_test/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: amplify_secure_storage_dart: any async: ^2.10.0 aws_common: any - built_collection: ^5.0.0 + built_collection: ^5.1.1 built_value: ^8.10.1 collection: ^1.18.0 convert: ^3.0.1 @@ -23,7 +23,7 @@ dependencies: shelf_web_socket: ^3.0.0 smithy: any smithy_aws: any - stream_channel: ^2.0.0 + stream_channel: ^2.1.0 stream_transform: ^2.1.0 test: ^1.22.1 web_socket_channel: ^3.0.3 @@ -33,6 +33,6 @@ dependencies: dev_dependencies: amplify_lints: path: ../../amplify_lints - build_runner: ^2.4.9 + build_runner: ^2.4.15 build_test: ^3.1.1 - build_web_compilers: ^4.0.0 + build_web_compilers: ^4.1.4 diff --git a/packages/authenticator/amplify_authenticator/example/lib/l10n/app_localizations.dart b/packages/authenticator/amplify_authenticator/example/lib/l10n/app_localizations.dart index 6f859f18f1a..3f31b9d6325 100644 --- a/packages/authenticator/amplify_authenticator/example/lib/l10n/app_localizations.dart +++ b/packages/authenticator/amplify_authenticator/example/lib/l10n/app_localizations.dart @@ -5,7 +5,6 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:intl/intl.dart' as intl; -//ignore_for_file: unused_import import 'app_localizations_en.dart'; import 'app_localizations_es.dart'; diff --git a/packages/authenticator/amplify_authenticator/example/lib/l10n/app_localizations_en.dart b/packages/authenticator/amplify_authenticator/example/lib/l10n/app_localizations_en.dart index 3f3dd6094e3..9ec2e93edc3 100644 --- a/packages/authenticator/amplify_authenticator/example/lib/l10n/app_localizations_en.dart +++ b/packages/authenticator/amplify_authenticator/example/lib/l10n/app_localizations_en.dart @@ -1,7 +1,5 @@ // ignore: unused_import import 'package:intl/intl.dart' as intl; - -// ignore: unused_import import 'app_localizations.dart'; // ignore_for_file: type=lint diff --git a/packages/authenticator/amplify_authenticator/example/lib/l10n/app_localizations_es.dart b/packages/authenticator/amplify_authenticator/example/lib/l10n/app_localizations_es.dart index d88ac3f38c0..bd267df1a68 100644 --- a/packages/authenticator/amplify_authenticator/example/lib/l10n/app_localizations_es.dart +++ b/packages/authenticator/amplify_authenticator/example/lib/l10n/app_localizations_es.dart @@ -1,7 +1,5 @@ // ignore: unused_import import 'package:intl/intl.dart' as intl; - -// ignore: unused_import import 'app_localizations.dart'; // ignore_for_file: type=lint diff --git a/packages/authenticator/amplify_authenticator/pubspec.yaml b/packages/authenticator/amplify_authenticator/pubspec.yaml index 60758138cc7..81e581f934a 100644 --- a/packages/authenticator/amplify_authenticator/pubspec.yaml +++ b/packages/authenticator/amplify_authenticator/pubspec.yaml @@ -35,7 +35,7 @@ dev_dependencies: amplify_integration_test: path: ../../test/amplify_integration_test amplify_lints: ">=3.1.4 <3.2.0" - build_runner: ^2.4.9 + build_runner: ^2.4.15 build_version: ^2.1.1 flutter_test: sdk: flutter diff --git a/packages/aws_common/pubspec.yaml b/packages/aws_common/pubspec.yaml index 90ae8e9abc5..928ce7dd4fc 100644 --- a/packages/aws_common/pubspec.yaml +++ b/packages/aws_common/pubspec.yaml @@ -10,7 +10,7 @@ environment: dependencies: async: ^2.10.0 - built_collection: ^5.0.0 + built_collection: ^5.1.1 built_value: ^8.10.1 collection: ^1.18.0 http: ^1.3.0 @@ -27,10 +27,10 @@ dependencies: dev_dependencies: amplify_lints: ">=3.1.4 <3.2.0" - build_runner: ^2.4.9 + build_runner: ^2.4.15 build_test: ^3.1.1 - build_web_compilers: ^4.0.0 + build_web_compilers: ^4.1.4 built_value_generator: ^8.10.1 - json_serializable: ">=6.9.4 <6.10.0" + json_serializable: ^6.11.0 stream_channel: ^2.1.0 test: ^1.22.1 diff --git a/packages/aws_signature_v4/example/pubspec.yaml b/packages/aws_signature_v4/example/pubspec.yaml index 60d926db2bc..3feaf583af6 100644 --- a/packages/aws_signature_v4/example/pubspec.yaml +++ b/packages/aws_signature_v4/example/pubspec.yaml @@ -19,5 +19,5 @@ dependency_overrides: dev_dependencies: amplify_lints: path: ../../amplify_lints - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 diff --git a/packages/aws_signature_v4/pubspec.yaml b/packages/aws_signature_v4/pubspec.yaml index 093e644a068..5992db776c1 100644 --- a/packages/aws_signature_v4/pubspec.yaml +++ b/packages/aws_signature_v4/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: aws_common: ">=0.7.11 <0.8.0" collection: ^1.18.0 convert: ^3.0.1 - crypto: ^3.0.1 + crypto: ^3.0.7 json_annotation: ^4.9.0 meta: ^1.16.0 path: ^1.8.0 @@ -21,12 +21,12 @@ dependencies: dev_dependencies: amplify_lints: ">=3.1.4 <3.2.0" args: ^2.5.0 - build_runner: ^2.4.9 + build_runner: ^2.4.15 build_test: ^3.1.1 build_verify: ^3.0.0 build_version: ^2.1.1 - build_web_compilers: ^4.0.0 - json_serializable: ">=6.9.4 <6.10.0" + build_web_compilers: ^4.1.4 + json_serializable: ^6.11.0 stream_channel: ^2.1.0 test: ^1.22.1 diff --git a/packages/common/amplify_db_common/example/pubspec.yaml b/packages/common/amplify_db_common/example/pubspec.yaml index 0353d4e9403..5ef1828c868 100644 --- a/packages/common/amplify_db_common/example/pubspec.yaml +++ b/packages/common/amplify_db_common/example/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: dev_dependencies: amplify_lints: ^3.1.0 drift_dev: ^2.25.1 - build_runner: ^2.4.9 + build_runner: ^2.4.15 flutter_test: sdk: flutter integration_test: diff --git a/packages/common/amplify_db_common_dart/example/pubspec.yaml b/packages/common/amplify_db_common_dart/example/pubspec.yaml index 6b2a5a1150f..9b27a9392a7 100644 --- a/packages/common/amplify_db_common_dart/example/pubspec.yaml +++ b/packages/common/amplify_db_common_dart/example/pubspec.yaml @@ -18,6 +18,6 @@ dependencies: dev_dependencies: amplify_lints: path: ../../../amplify_lints - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 drift_dev: ^2.25.1 diff --git a/packages/common/amplify_db_common_dart/pubspec.yaml b/packages/common/amplify_db_common_dart/pubspec.yaml index d8b75e13ae9..110e4759193 100644 --- a/packages/common/amplify_db_common_dart/pubspec.yaml +++ b/packages/common/amplify_db_common_dart/pubspec.yaml @@ -20,8 +20,8 @@ dependencies: dev_dependencies: amplify_lints: ">=3.1.4 <3.2.0" - build_runner: ^2.4.9 + build_runner: ^2.4.15 build_test: ^3.1.1 - build_web_compilers: ^4.0.0 + build_web_compilers: ^4.1.4 drift_dev: ^2.25.1 test: ^1.22.1 diff --git a/packages/example_common/example/pubspec.yaml b/packages/example_common/example/pubspec.yaml index 3ddce61d8cd..c4528a93fa5 100644 --- a/packages/example_common/example/pubspec.yaml +++ b/packages/example_common/example/pubspec.yaml @@ -13,5 +13,5 @@ dependencies: dev_dependencies: amplify_lints: path: ../../amplify_lints - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 diff --git a/packages/notifications/push/amplify_push_notifications/Makefile b/packages/notifications/push/amplify_push_notifications/Makefile index 37f99578f9d..7315a2363e6 100644 --- a/packages/notifications/push/amplify_push_notifications/Makefile +++ b/packages/notifications/push/amplify_push_notifications/Makefile @@ -1,4 +1,4 @@ .PHONY: pigeons pigeons: dart run pigeon --input pigeons/native_push_notification_plugin.dart - dart format --fix lib/src/native_push_notifications_plugin.g.dart + dart format lib/src/native_push_notifications_plugin.g.dart diff --git a/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationsHostApiBindings.java b/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationsHostApiBindings.java index 2539753edcb..ca16a63cda0 100644 --- a/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationsHostApiBindings.java +++ b/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationsHostApiBindings.java @@ -1,7 +1,7 @@ // // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v25.5.0), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon package com.amazonaws.amplify.amplify_push_notifications; diff --git a/packages/notifications/push/amplify_push_notifications/example/linux/flutter/generated_plugin_registrant.cc b/packages/notifications/push/amplify_push_notifications/example/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 00000000000..e71a16d23d0 --- /dev/null +++ b/packages/notifications/push/amplify_push_notifications/example/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,11 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + + +void fl_register_plugins(FlPluginRegistry* registry) { +} diff --git a/packages/notifications/push/amplify_push_notifications/example/linux/flutter/generated_plugin_registrant.h b/packages/notifications/push/amplify_push_notifications/example/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 00000000000..e0f0a47bc08 --- /dev/null +++ b/packages/notifications/push/amplify_push_notifications/example/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/packages/notifications/push/amplify_push_notifications/example/linux/flutter/generated_plugins.cmake b/packages/notifications/push/amplify_push_notifications/example/linux/flutter/generated_plugins.cmake new file mode 100644 index 00000000000..2e1de87a7eb --- /dev/null +++ b/packages/notifications/push/amplify_push_notifications/example/linux/flutter/generated_plugins.cmake @@ -0,0 +1,23 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/packages/notifications/push/amplify_push_notifications/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/notifications/push/amplify_push_notifications/example/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 00000000000..13b6076235d --- /dev/null +++ b/packages/notifications/push/amplify_push_notifications/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,16 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + +import amplify_secure_storage +import path_provider_foundation +import shared_preferences_foundation + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) + PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) + SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) +} diff --git a/packages/notifications/push/amplify_push_notifications/example/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/packages/notifications/push/amplify_push_notifications/example/macos/Flutter/ephemeral/Flutter-Generated.xcconfig new file mode 100644 index 00000000000..72fc3a33af7 --- /dev/null +++ b/packages/notifications/push/amplify_push_notifications/example/macos/Flutter/ephemeral/Flutter-Generated.xcconfig @@ -0,0 +1,11 @@ +// This is a generated file; do not edit or check into version control. +FLUTTER_ROOT=/Users/tyllark/development/flutter +FLUTTER_APPLICATION_PATH=/Users/tyllark/Documents/GitHub/amplify-flutter/packages/notifications/push/amplify_push_notifications/example +COCOAPODS_PARALLEL_CODE_SIGN=true +FLUTTER_BUILD_DIR=build +FLUTTER_BUILD_NAME=0.1.0 +FLUTTER_BUILD_NUMBER=0.1.0 +DART_OBFUSCATION=false +TRACK_WIDGET_CREATION=true +TREE_SHAKE_ICONS=false +PACKAGE_CONFIG=.dart_tool/package_config.json diff --git a/packages/notifications/push/amplify_push_notifications/example/macos/Flutter/ephemeral/flutter_export_environment.sh b/packages/notifications/push/amplify_push_notifications/example/macos/Flutter/ephemeral/flutter_export_environment.sh new file mode 100755 index 00000000000..598841f2049 --- /dev/null +++ b/packages/notifications/push/amplify_push_notifications/example/macos/Flutter/ephemeral/flutter_export_environment.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# This is a generated file; do not edit or check into version control. +export "FLUTTER_ROOT=/Users/tyllark/development/flutter" +export "FLUTTER_APPLICATION_PATH=/Users/tyllark/Documents/GitHub/amplify-flutter/packages/notifications/push/amplify_push_notifications/example" +export "COCOAPODS_PARALLEL_CODE_SIGN=true" +export "FLUTTER_BUILD_DIR=build" +export "FLUTTER_BUILD_NAME=0.1.0" +export "FLUTTER_BUILD_NUMBER=0.1.0" +export "DART_OBFUSCATION=false" +export "TRACK_WIDGET_CREATION=true" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.dart_tool/package_config.json" diff --git a/packages/notifications/push/amplify_push_notifications/example/macos/Podfile b/packages/notifications/push/amplify_push_notifications/example/macos/Podfile new file mode 100644 index 00000000000..ff5ddb3b8bd --- /dev/null +++ b/packages/notifications/push/amplify_push_notifications/example/macos/Podfile @@ -0,0 +1,42 @@ +platform :osx, '10.15' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\"" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_macos_podfile_setup + +target 'Runner' do + use_frameworks! + + flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_macos_build_settings(target) + end +end diff --git a/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.h b/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.h index a1a8d9a97c6..51896754fae 100644 --- a/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.h +++ b/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.h @@ -1,7 +1,7 @@ // // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v25.5.0), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon #import diff --git a/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.m b/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.m index 1d2489d6b81..ba5065c50e6 100644 --- a/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.m +++ b/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.m @@ -1,7 +1,7 @@ // // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v25.5.0), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon #import "PushNotificationsNativePlugin.h" diff --git a/packages/notifications/push/amplify_push_notifications/lib/src/native_push_notifications_plugin.g.dart b/packages/notifications/push/amplify_push_notifications/lib/src/native_push_notifications_plugin.g.dart index 4d31cfad8d3..0c105b7f4f6 100644 --- a/packages/notifications/push/amplify_push_notifications/lib/src/native_push_notifications_plugin.g.dart +++ b/packages/notifications/push/amplify_push_notifications/lib/src/native_push_notifications_plugin.g.dart @@ -1,7 +1,7 @@ // // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// Autogenerated from Pigeon (v25.5.0), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers diff --git a/packages/notifications/push/amplify_push_notifications/pubspec.yaml b/packages/notifications/push/amplify_push_notifications/pubspec.yaml index 47351f2d2e8..a10df82f0fe 100644 --- a/packages/notifications/push/amplify_push_notifications/pubspec.yaml +++ b/packages/notifications/push/amplify_push_notifications/pubspec.yaml @@ -24,12 +24,12 @@ dev_dependencies: amplify_test: path: ../../../test/amplify_test aws_signature_v4: ">=0.6.9 <0.7.0" - build_runner: ^2.4.9 + build_runner: ^2.4.15 build_test: ^3.1.1 flutter_test: sdk: flutter mockito: ^5.0.0 - pigeon: ^25.5.0 + pigeon: ^26.0.0 test: ^1.22.1 flutter: diff --git a/packages/notifications/push/amplify_push_notifications/test/amplify_push_notifications_impl_test.mocks.dart b/packages/notifications/push/amplify_push_notifications/test/amplify_push_notifications_impl_test.mocks.dart index 06ebf4cd192..5f13b7fa8b8 100644 --- a/packages/notifications/push/amplify_push_notifications/test/amplify_push_notifications_impl_test.mocks.dart +++ b/packages/notifications/push/amplify_push_notifications/test/amplify_push_notifications_impl_test.mocks.dart @@ -32,6 +32,7 @@ import 'package:mockito/src/dummies.dart' as _i5; // ignore_for_file: unnecessary_parenthesis // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class +// ignore_for_file: invalid_use_of_internal_member class _FakeGetPermissionStatusResult_0 extends _i1.SmartFake implements _i2.GetPermissionStatusResult { diff --git a/packages/notifications/push/amplify_push_notifications_pinpoint/pubspec.yaml b/packages/notifications/push/amplify_push_notifications_pinpoint/pubspec.yaml index b3772c8c9f6..1418c34c222 100644 --- a/packages/notifications/push/amplify_push_notifications_pinpoint/pubspec.yaml +++ b/packages/notifications/push/amplify_push_notifications_pinpoint/pubspec.yaml @@ -32,7 +32,7 @@ dev_dependencies: path: ../../../test/amplify_test aws_common: ">=0.7.11 <0.8.0" aws_signature_v4: ">=0.6.9 <0.7.0" - build_runner: ^2.4.9 + build_runner: ^2.4.15 built_value_generator: ^8.10.1 flutter_test: sdk: flutter diff --git a/packages/secure_storage/amplify_secure_storage/Makefile b/packages/secure_storage/amplify_secure_storage/Makefile index f772f2b8eda..9c20f5fc058 100644 --- a/packages/secure_storage/amplify_secure_storage/Makefile +++ b/packages/secure_storage/amplify_secure_storage/Makefile @@ -6,7 +6,7 @@ pigeons: pigeons_secure_storage pigeons_ns_user_defaults pigeons_secure_storage: dart run pigeon --input pigeons/amplify_secure_storage.dart - dart format --fix lib/src/pigeons/amplify_secure_storage_pigeon.g.dart + dart format lib/src/pigeons/amplify_secure_storage_pigeon.g.dart pigeons_ns_user_defaults: dart run pigeon --input pigeons/ns_user_defaults.dart @@ -14,4 +14,4 @@ pigeons_ns_user_defaults: # flutter version is 3.7.0+ # see: https://docs.flutter.dev/packages-and-plugins/developing-packages#shared-ios-and-macos-implementations cp ios/Classes/pigeons/NSUserDefaultsPigeon.swift macos/Classes/pigeons/NSUserDefaultsPigeon.swift - dart format --fix lib/src/pigeons/ns_user_defaults_pigeon.g.dart + dart format lib/src/pigeons/ns_user_defaults_pigeon.g.dart diff --git a/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/pigeons/AmplifySecureStoragePigeon.kt b/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/pigeons/AmplifySecureStoragePigeon.kt index 3b25adf567f..a2ba5bc3b5f 100644 --- a/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/pigeons/AmplifySecureStoragePigeon.kt +++ b/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/pigeons/AmplifySecureStoragePigeon.kt @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // -// Autogenerated from Pigeon (v25.5.0), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon @file:Suppress("UNCHECKED_CAST", "ArrayInDataClass") diff --git a/packages/secure_storage/amplify_secure_storage/ios/Classes/pigeons/NSUserDefaultsPigeon.swift b/packages/secure_storage/amplify_secure_storage/ios/Classes/pigeons/NSUserDefaultsPigeon.swift index d6cfe5e2040..f650fc89a37 100644 --- a/packages/secure_storage/amplify_secure_storage/ios/Classes/pigeons/NSUserDefaultsPigeon.swift +++ b/packages/secure_storage/amplify_secure_storage/ios/Classes/pigeons/NSUserDefaultsPigeon.swift @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // -// Autogenerated from Pigeon (v22.6.2), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon import Foundation @@ -18,9 +18,9 @@ import Foundation final class PigeonError: Error { let code: String let message: String? - let details: Any? + let details: Sendable? - init(code: String, message: String?, details: Any?) { + init(code: String, message: String?, details: Sendable?) { self.code = code self.message = message self.details = details @@ -29,7 +29,7 @@ final class PigeonError: Error { var localizedDescription: String { return "PigeonError(code: \(code), message: \(message ?? ""), details: \(details ?? "")" - } + } } private func wrapResult(_ result: Any?) -> [Any?] { @@ -67,6 +67,7 @@ private func nilOrValue(_ value: Any?) -> T? { return value as! T? } + private class NSUserDefaultsPigeonPigeonCodecReader: FlutterStandardReader { } diff --git a/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/amplify_secure_storage_pigeon.g.dart b/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/amplify_secure_storage_pigeon.g.dart index 53c60011aa4..b45188b9d5c 100644 --- a/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/amplify_secure_storage_pigeon.g.dart +++ b/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/amplify_secure_storage_pigeon.g.dart @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // -// Autogenerated from Pigeon (v25.5.0), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers diff --git a/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/ns_user_defaults_pigeon.g.dart b/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/ns_user_defaults_pigeon.g.dart index 4412db0213c..1c8773863c7 100644 --- a/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/ns_user_defaults_pigeon.g.dart +++ b/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/ns_user_defaults_pigeon.g.dart @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // -// Autogenerated from Pigeon (v22.6.2), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers @@ -66,8 +66,11 @@ class NSUserDefaultsPigeon { pigeonChannelCodec, binaryMessenger: pigeonVar_binaryMessenger, ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [key, value], + ); final List? pigeonVar_replyList = - await pigeonVar_channel.send([key, value]) as List?; + await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { throw _createConnectionError(pigeonVar_channelName); } else if (pigeonVar_replyList.length > 1) { @@ -90,8 +93,11 @@ class NSUserDefaultsPigeon { pigeonChannelCodec, binaryMessenger: pigeonVar_binaryMessenger, ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [key], + ); final List? pigeonVar_replyList = - await pigeonVar_channel.send([key]) as List?; + await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { throw _createConnectionError(pigeonVar_channelName); } else if (pigeonVar_replyList.length > 1) { diff --git a/packages/secure_storage/amplify_secure_storage/macos/Classes/pigeons/NSUserDefaultsPigeon.swift b/packages/secure_storage/amplify_secure_storage/macos/Classes/pigeons/NSUserDefaultsPigeon.swift index d6cfe5e2040..f650fc89a37 100644 --- a/packages/secure_storage/amplify_secure_storage/macos/Classes/pigeons/NSUserDefaultsPigeon.swift +++ b/packages/secure_storage/amplify_secure_storage/macos/Classes/pigeons/NSUserDefaultsPigeon.swift @@ -1,7 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // -// Autogenerated from Pigeon (v22.6.2), do not edit directly. +// Autogenerated from Pigeon (v26.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon import Foundation @@ -18,9 +18,9 @@ import Foundation final class PigeonError: Error { let code: String let message: String? - let details: Any? + let details: Sendable? - init(code: String, message: String?, details: Any?) { + init(code: String, message: String?, details: Sendable?) { self.code = code self.message = message self.details = details @@ -29,7 +29,7 @@ final class PigeonError: Error { var localizedDescription: String { return "PigeonError(code: \(code), message: \(message ?? ""), details: \(details ?? "")" - } + } } private func wrapResult(_ result: Any?) -> [Any?] { @@ -67,6 +67,7 @@ private func nilOrValue(_ value: Any?) -> T? { return value as! T? } + private class NSUserDefaultsPigeonPigeonCodecReader: FlutterStandardReader { } diff --git a/packages/secure_storage/amplify_secure_storage/pubspec.yaml b/packages/secure_storage/amplify_secure_storage/pubspec.yaml index df1e6e8bb06..31029d0188a 100644 --- a/packages/secure_storage/amplify_secure_storage/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage/pubspec.yaml @@ -26,7 +26,7 @@ dev_dependencies: amplify_lints: ">=3.1.4 <3.2.0" flutter_test: sdk: flutter - pigeon: ^25.5.0 + pigeon: ^26.0.0 flutter: plugin: diff --git a/packages/secure_storage/amplify_secure_storage_dart/example/pubspec.yaml b/packages/secure_storage/amplify_secure_storage_dart/example/pubspec.yaml index 7a3cc408429..c75c8096666 100644 --- a/packages/secure_storage/amplify_secure_storage_dart/example/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage_dart/example/pubspec.yaml @@ -17,5 +17,5 @@ dependencies: dev_dependencies: amplify_lints: path: ../../../amplify_lints - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 diff --git a/packages/secure_storage/amplify_secure_storage_dart/lib/src/worker/secure_storage_worker.worker.dart b/packages/secure_storage/amplify_secure_storage_dart/lib/src/worker/secure_storage_worker.worker.dart index 3033ee6fe50..a2120428071 100644 --- a/packages/secure_storage/amplify_secure_storage_dart/lib/src/worker/secure_storage_worker.worker.dart +++ b/packages/secure_storage/amplify_secure_storage_dart/lib/src/worker/secure_storage_worker.worker.dart @@ -1,5 +1,5 @@ -// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 // ************************************************************************** // WorkerBeeGenerator diff --git a/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml b/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml index ef0ea4b5a86..834dd0dde97 100644 --- a/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml @@ -22,7 +22,7 @@ platforms: dependencies: async: ^2.10.0 aws_common: ">=0.7.11 <0.8.0" - built_collection: ^5.0.0 + built_collection: ^5.1.1 built_value: ^8.10.1 ffi: ^2.0.2 file: ^7.0.1 @@ -36,7 +36,7 @@ dev_dependencies: amplify_lints: ">=3.1.4 <3.2.0" amplify_secure_storage_test: path: ../amplify_secure_storage_test - build: ^2.3.0 + build: ^4.0.0 build_runner: ^2.4.15 build_web_compilers: ^4.1.4 built_value_generator: ^8.10.1 diff --git a/packages/secure_storage/amplify_secure_storage_test/pubspec.yaml b/packages/secure_storage/amplify_secure_storage_test/pubspec.yaml index 2fe7f00dddd..0c207df4832 100644 --- a/packages/secure_storage/amplify_secure_storage_test/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage_test/pubspec.yaml @@ -17,6 +17,6 @@ dependencies: dev_dependencies: amplify_lints: path: ../../amplify_lints - build_runner: ^2.4.9 + build_runner: ^2.4.15 build_test: ^3.1.1 - build_web_compilers: ^4.0.0 + build_web_compilers: ^4.1.4 diff --git a/packages/smithy/goldens/lib/awsJson1_0/pubspec.yaml b/packages/smithy/goldens/lib/awsJson1_0/pubspec.yaml index d0046ac2c82..9a55e59440f 100644 --- a/packages/smithy/goldens/lib/awsJson1_0/pubspec.yaml +++ b/packages/smithy/goldens/lib/awsJson1_0/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: aws_common: path: ../../../../aws_common built_value: ^8.10.1 - built_collection: ^5.0.0 + built_collection: ^5.1.1 shelf_router: ^1.1.3 shelf: ^1.4.0 meta: ^1.16.0 @@ -36,8 +36,8 @@ dependency_overrides: dev_dependencies: smithy_test: path: ../../../smithy_test - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 build_test: ^3.1.1 built_value_generator: ^8.10.1 lints: ^6.0.0 diff --git a/packages/smithy/goldens/lib/awsJson1_1/pubspec.yaml b/packages/smithy/goldens/lib/awsJson1_1/pubspec.yaml index 4d564f4da9e..6b7ae4fa517 100644 --- a/packages/smithy/goldens/lib/awsJson1_1/pubspec.yaml +++ b/packages/smithy/goldens/lib/awsJson1_1/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: aws_common: path: ../../../../aws_common built_value: ^8.10.1 - built_collection: ^5.0.0 + built_collection: ^5.1.1 fixnum: ^1.0.0 shelf_router: ^1.1.3 shelf: ^1.4.0 @@ -39,8 +39,8 @@ dependency_overrides: dev_dependencies: smithy_test: path: ../../../smithy_test - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 build_test: ^3.1.1 built_value_generator: ^8.10.1 lints: ^6.0.0 diff --git a/packages/smithy/goldens/lib/awsQuery/pubspec.yaml b/packages/smithy/goldens/lib/awsQuery/pubspec.yaml index 02455d73990..f146802cb7b 100644 --- a/packages/smithy/goldens/lib/awsQuery/pubspec.yaml +++ b/packages/smithy/goldens/lib/awsQuery/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: aws_common: path: ../../../../aws_common built_value: ^8.10.1 - built_collection: ^5.0.0 + built_collection: ^5.1.1 fixnum: ^1.0.0 meta: ^1.16.0 @@ -35,8 +35,8 @@ dependency_overrides: dev_dependencies: smithy_test: path: ../../../smithy_test - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 build_test: ^3.1.1 built_value_generator: ^8.10.1 lints: ^6.0.0 diff --git a/packages/smithy/goldens/lib/ec2Query/pubspec.yaml b/packages/smithy/goldens/lib/ec2Query/pubspec.yaml index 6fdd92c5ce0..9b75a0d7f66 100644 --- a/packages/smithy/goldens/lib/ec2Query/pubspec.yaml +++ b/packages/smithy/goldens/lib/ec2Query/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: aws_common: path: ../../../../aws_common built_value: ^8.10.1 - built_collection: ^5.0.0 + built_collection: ^5.1.1 fixnum: ^1.0.0 meta: ^1.16.0 @@ -35,8 +35,8 @@ dependency_overrides: dev_dependencies: smithy_test: path: ../../../smithy_test - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 build_test: ^3.1.1 built_value_generator: ^8.10.1 lints: ^6.0.0 diff --git a/packages/smithy/goldens/lib/restJson1/pubspec.yaml b/packages/smithy/goldens/lib/restJson1/pubspec.yaml index ac2ea2612b0..047a5e03b2f 100644 --- a/packages/smithy/goldens/lib/restJson1/pubspec.yaml +++ b/packages/smithy/goldens/lib/restJson1/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: path: ../../../../aws_common built_value: ^8.10.1 fixnum: ^1.0.0 - built_collection: ^5.0.0 + built_collection: ^5.1.1 meta: ^1.16.0 shelf_router: ^1.1.3 shelf: ^1.4.0 @@ -39,8 +39,8 @@ dependency_overrides: dev_dependencies: smithy_test: path: ../../../smithy_test - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 build_test: ^3.1.1 built_value_generator: ^8.10.1 lints: ^6.0.0 diff --git a/packages/smithy/goldens/lib/restXml/pubspec.yaml b/packages/smithy/goldens/lib/restXml/pubspec.yaml index be0f5b83393..994f4e9b932 100644 --- a/packages/smithy/goldens/lib/restXml/pubspec.yaml +++ b/packages/smithy/goldens/lib/restXml/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: path: ../../../../aws_common built_value: ^8.10.1 fixnum: ^1.0.0 - built_collection: ^5.0.0 + built_collection: ^5.1.1 meta: ^1.16.0 xml: ^6.5.0 shelf_router: ^1.1.3 @@ -40,8 +40,8 @@ dependency_overrides: dev_dependencies: smithy_test: path: ../../../smithy_test - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 build_test: ^3.1.1 built_value_generator: ^8.10.1 lints: ^6.0.0 diff --git a/packages/smithy/goldens/lib/restXmlWithNamespace/pubspec.yaml b/packages/smithy/goldens/lib/restXmlWithNamespace/pubspec.yaml index 4e93e7a92cb..b8eb12858f0 100644 --- a/packages/smithy/goldens/lib/restXmlWithNamespace/pubspec.yaml +++ b/packages/smithy/goldens/lib/restXmlWithNamespace/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: xml: ^6.5.0 fixnum: ^1.0.0 meta: ^1.16.0 - built_collection: ^5.0.0 + built_collection: ^5.1.1 shelf_router: ^1.1.3 shelf: ^1.4.0 @@ -38,8 +38,8 @@ dependency_overrides: dev_dependencies: smithy_test: path: ../../../smithy_test - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 build_test: ^3.1.1 built_value_generator: ^8.10.1 lints: ^6.0.0 diff --git a/packages/smithy/goldens/lib2/awsJson1_0/pubspec.yaml b/packages/smithy/goldens/lib2/awsJson1_0/pubspec.yaml index 06044b1edb5..0613cf521b9 100644 --- a/packages/smithy/goldens/lib2/awsJson1_0/pubspec.yaml +++ b/packages/smithy/goldens/lib2/awsJson1_0/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: aws_common: path: ../../../../aws_common built_value: ^8.10.1 - built_collection: ^5.0.0 + built_collection: ^5.1.1 shelf_router: ^1.1.3 shelf: ^1.4.0 meta: ^1.16.0 @@ -36,8 +36,8 @@ dependency_overrides: dev_dependencies: smithy_test: path: ../../../smithy_test - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 build_test: ^3.1.1 built_value_generator: ^8.10.1 lints: ^6.0.0 diff --git a/packages/smithy/goldens/lib2/awsJson1_1/pubspec.yaml b/packages/smithy/goldens/lib2/awsJson1_1/pubspec.yaml index 13848593bce..abc002af7b0 100644 --- a/packages/smithy/goldens/lib2/awsJson1_1/pubspec.yaml +++ b/packages/smithy/goldens/lib2/awsJson1_1/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: aws_common: path: ../../../../aws_common built_value: ^8.10.1 - built_collection: ^5.0.0 + built_collection: ^5.1.1 fixnum: ^1.0.0 shelf_router: ^1.1.3 shelf: ^1.4.0 @@ -39,8 +39,8 @@ dependency_overrides: dev_dependencies: smithy_test: path: ../../../smithy_test - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 build_test: ^3.1.1 built_value_generator: ^8.10.1 lints: ^6.0.0 diff --git a/packages/smithy/goldens/lib2/awsQuery/pubspec.yaml b/packages/smithy/goldens/lib2/awsQuery/pubspec.yaml index 4fa41a665bd..941bd060aa4 100644 --- a/packages/smithy/goldens/lib2/awsQuery/pubspec.yaml +++ b/packages/smithy/goldens/lib2/awsQuery/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: aws_common: path: ../../../../aws_common built_value: ^8.10.1 - built_collection: ^5.0.0 + built_collection: ^5.1.1 fixnum: ^1.0.0 meta: ^1.16.0 @@ -35,8 +35,8 @@ dependency_overrides: dev_dependencies: smithy_test: path: ../../../smithy_test - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 build_test: ^3.1.1 built_value_generator: ^8.10.1 lints: ^6.0.0 diff --git a/packages/smithy/goldens/lib2/custom/lib/src/custom/model/checksum_algorithm.dart b/packages/smithy/goldens/lib2/custom/lib/src/custom/model/checksum_algorithm.dart index b423e618f5e..dbcbcfc1148 100644 --- a/packages/smithy/goldens/lib2/custom/lib/src/custom/model/checksum_algorithm.dart +++ b/packages/smithy/goldens/lib2/custom/lib/src/custom/model/checksum_algorithm.dart @@ -14,14 +14,17 @@ class ChecksumAlgorithm extends _i1.SmithyEnum { static const crc32C = ChecksumAlgorithm._(1, 'CRC32C', 'CRC32C'); - static const sha1 = ChecksumAlgorithm._(2, 'SHA1', 'SHA1'); + static const crc64Nvme = ChecksumAlgorithm._(2, 'CRC64NVME', 'CRC64NVME'); - static const sha256 = ChecksumAlgorithm._(3, 'SHA256', 'SHA256'); + static const sha1 = ChecksumAlgorithm._(3, 'SHA1', 'SHA1'); + + static const sha256 = ChecksumAlgorithm._(4, 'SHA256', 'SHA256'); /// All values of [ChecksumAlgorithm]. static const values = [ ChecksumAlgorithm.crc32, ChecksumAlgorithm.crc32C, + ChecksumAlgorithm.crc64Nvme, ChecksumAlgorithm.sha1, ChecksumAlgorithm.sha256, ]; diff --git a/packages/smithy/goldens/lib2/custom/pubspec.yaml b/packages/smithy/goldens/lib2/custom/pubspec.yaml index d3b18375c97..db40b49aa91 100644 --- a/packages/smithy/goldens/lib2/custom/pubspec.yaml +++ b/packages/smithy/goldens/lib2/custom/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: path: ../../../../aws_common built_value: ^8.10.1 meta: ^1.16.0 - built_collection: ^5.0.0 + built_collection: ^5.1.1 shelf_router: ^1.1.3 shelf: ^1.4.0 @@ -38,8 +38,8 @@ dependency_overrides: dev_dependencies: smithy_test: path: ../../../smithy_test - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 build_test: ^3.1.1 built_value_generator: ^8.10.1 lints: ^6.0.0 diff --git a/packages/smithy/goldens/lib2/custom/test/custom/http_checksum_required_with_member_operation_test.dart b/packages/smithy/goldens/lib2/custom/test/custom/http_checksum_required_with_member_operation_test.dart index 5ee550a794a..37a897a0b2b 100644 --- a/packages/smithy/goldens/lib2/custom/test/custom/http_checksum_required_with_member_operation_test.dart +++ b/packages/smithy/goldens/lib2/custom/test/custom/http_checksum_required_with_member_operation_test.dart @@ -207,6 +207,45 @@ void main() { ], ); }); + _i1.test('HttpChecksumRequiredWithMemberWithCRC64NVME (request)', () async { + await _i2.httpRequestTest( + operation: HttpChecksumRequiredWithMemberOperation( + region: 'us-east-1', + baseUri: Uri.parse('https://example.com'), + ), + testCase: const _i2.HttpRequestTestCase( + id: 'HttpChecksumRequiredWithMemberWithCRC64NVME', + documentation: + 'Adds a CRC64NVME checksum when that algorithm is provided', + protocol: _i3.ShapeId(namespace: 'aws.protocols', shape: 'restJson1'), + authScheme: null, + body: 'hello, world', + bodyMediaType: 'application/octet-stream', + params: {'checksumAlgorithm': 'CRC64NVME', 'content': 'hello, world'}, + vendorParamsShape: null, + vendorParams: {}, + headers: { + 'Content-Type': 'application/octet-stream', + 'x-amz-checksum-crc64nvme': 'imGzfIgXKM8=', + 'x-amz-request-algorithm': 'CRC64NVME', + }, + forbidHeaders: [], + requireHeaders: [], + tags: [], + appliesTo: null, + method: 'POST', + uri: '/requiredWithMember', + host: null, + resolvedHost: null, + queryParams: [], + forbidQueryParams: [], + requireQueryParams: [], + ), + inputSerializers: const [ + HttpChecksumRequiredWithMemberInputRestJson1Serializer(), + ], + ); + }); } class HttpChecksumRequiredWithMemberInputRestJson1Serializer diff --git a/packages/smithy/goldens/lib2/ec2Query/pubspec.yaml b/packages/smithy/goldens/lib2/ec2Query/pubspec.yaml index ae6dc6de4ba..a388fee2b26 100644 --- a/packages/smithy/goldens/lib2/ec2Query/pubspec.yaml +++ b/packages/smithy/goldens/lib2/ec2Query/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: aws_common: path: ../../../../aws_common built_value: ^8.10.1 - built_collection: ^5.0.0 + built_collection: ^5.1.1 fixnum: ^1.0.0 meta: ^1.16.0 @@ -35,8 +35,8 @@ dependency_overrides: dev_dependencies: smithy_test: path: ../../../smithy_test - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 build_test: ^3.1.1 built_value_generator: ^8.10.1 lints: ^6.0.0 diff --git a/packages/smithy/goldens/lib2/restJson1/pubspec.yaml b/packages/smithy/goldens/lib2/restJson1/pubspec.yaml index 313fd252c3d..b188234160a 100644 --- a/packages/smithy/goldens/lib2/restJson1/pubspec.yaml +++ b/packages/smithy/goldens/lib2/restJson1/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: path: ../../../../aws_common built_value: ^8.10.1 fixnum: ^1.0.0 - built_collection: ^5.0.0 + built_collection: ^5.1.1 meta: ^1.16.0 shelf_router: ^1.1.3 shelf: ^1.4.0 @@ -39,8 +39,8 @@ dependency_overrides: dev_dependencies: smithy_test: path: ../../../smithy_test - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 build_test: ^3.1.1 built_value_generator: ^8.10.1 lints: ^6.0.0 diff --git a/packages/smithy/goldens/lib2/restXml/pubspec.yaml b/packages/smithy/goldens/lib2/restXml/pubspec.yaml index c23715e7459..3a45a0de705 100644 --- a/packages/smithy/goldens/lib2/restXml/pubspec.yaml +++ b/packages/smithy/goldens/lib2/restXml/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: path: ../../../../aws_common built_value: ^8.10.1 fixnum: ^1.0.0 - built_collection: ^5.0.0 + built_collection: ^5.1.1 meta: ^1.16.0 xml: ^6.5.0 shelf_router: ^1.1.3 @@ -40,8 +40,8 @@ dependency_overrides: dev_dependencies: smithy_test: path: ../../../smithy_test - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 build_test: ^3.1.1 built_value_generator: ^8.10.1 lints: ^6.0.0 diff --git a/packages/smithy/goldens/lib2/restXmlWithNamespace/pubspec.yaml b/packages/smithy/goldens/lib2/restXmlWithNamespace/pubspec.yaml index 57cef600189..c240c8175d2 100644 --- a/packages/smithy/goldens/lib2/restXmlWithNamespace/pubspec.yaml +++ b/packages/smithy/goldens/lib2/restXmlWithNamespace/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: xml: ^6.5.0 fixnum: ^1.0.0 meta: ^1.16.0 - built_collection: ^5.0.0 + built_collection: ^5.1.1 shelf_router: ^1.1.3 shelf: ^1.4.0 @@ -38,8 +38,8 @@ dependency_overrides: dev_dependencies: smithy_test: path: ../../../smithy_test - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 build_test: ^3.1.1 built_value_generator: ^8.10.1 lints: ^6.0.0 diff --git a/packages/smithy/goldens/smithy-build.json b/packages/smithy/goldens/smithy-build.json index 86255f9a58c..ed8105f2038 100644 --- a/packages/smithy/goldens/smithy-build.json +++ b/packages/smithy/goldens/smithy-build.json @@ -1,12 +1,12 @@ { "mavenDependencies": [ - "software.amazon.smithy:smithy-model:1.35.0", - "software.amazon.smithy:smithy-aws-apigateway-traits:1.35.0", - "software.amazon.smithy:smithy-aws-cloudformation-traits:1.35.0", - "software.amazon.smithy:smithy-aws-iam-traits:1.35.0", - "software.amazon.smithy:smithy-aws-traits:1.35.0", - "software.amazon.smithy:smithy-mqtt-traits:1.35.0", - "software.amazon.smithy:smithy-protocol-test-traits:1.35.0", - "software.amazon.smithy:smithy-validation-model:1.35.0" + "software.amazon.smithy:smithy-model:1.64.0", + "software.amazon.smithy:smithy-aws-apigateway-traits:1.64.0", + "software.amazon.smithy:smithy-aws-cloudformation-traits:1.64.0", + "software.amazon.smithy:smithy-aws-iam-traits:1.64.0", + "software.amazon.smithy:smithy-aws-traits:1.64.0", + "software.amazon.smithy:smithy-mqtt-traits:1.64.0", + "software.amazon.smithy:smithy-protocol-test-traits:1.64.0", + "software.amazon.smithy:smithy-validation-model:1.64.0" ] -} \ No newline at end of file +} diff --git a/packages/smithy/goldens/smithy-version b/packages/smithy/goldens/smithy-version index a2d87226ac2..9405730420f 100644 --- a/packages/smithy/goldens/smithy-version +++ b/packages/smithy/goldens/smithy-version @@ -1 +1 @@ -1.35.0 \ No newline at end of file +1.64.0 diff --git a/packages/smithy/smithy/pubspec.yaml b/packages/smithy/smithy/pubspec.yaml index fd9fecf50b4..fe054052933 100644 --- a/packages/smithy/smithy/pubspec.yaml +++ b/packages/smithy/smithy/pubspec.yaml @@ -11,11 +11,11 @@ environment: dependencies: async: ^2.10.0 aws_common: ">=0.7.11 <0.8.0" - built_collection: ^5.0.0 + built_collection: ^5.1.1 built_value: ^8.10.1 collection: ^1.18.0 convert: ^3.0.1 - crypto: ^3.0.1 + crypto: ^3.0.7 fixnum: ^1.0.0 http_parser: ^4.0.0 intl: ^0.20.2 @@ -29,8 +29,8 @@ dependencies: dev_dependencies: amplify_lints: ">=3.1.4 <3.2.0" - build_runner: ^2.4.9 + build_runner: ^2.4.15 built_value_generator: ^8.10.1 - json_serializable: ">=6.9.4 <6.10.0" + json_serializable: ^6.11.0 stack_trace: ^1.10.0 test: ^1.22.1 diff --git a/packages/smithy/smithy_aws/lib/src/http/interceptors/crc64nvme.dart b/packages/smithy/smithy_aws/lib/src/http/interceptors/crc64nvme.dart new file mode 100644 index 00000000000..bfd1462806a --- /dev/null +++ b/packages/smithy/smithy_aws/lib/src/http/interceptors/crc64nvme.dart @@ -0,0 +1,8 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 + +// CRC-64/NVME implementation with platform-specific optimizations. +// This file exports the appropriate implementation based on the platform: +// - On Dart VM: Uses native 64-bit integers +// - On JavaScript: Uses BigInt for 64-bit values +export 'crc64nvme_js.dart' if (dart.library.io) 'crc64nvme_vm.dart'; diff --git a/packages/smithy/smithy_aws/lib/src/http/interceptors/crc64nvme_js.dart b/packages/smithy/smithy_aws/lib/src/http/interceptors/crc64nvme_js.dart new file mode 100644 index 00000000000..30a8dfef553 --- /dev/null +++ b/packages/smithy/smithy_aws/lib/src/http/interceptors/crc64nvme_js.dart @@ -0,0 +1,22 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 + +import 'package:crclib/crclib.dart'; + +/// CRC-64/NVME implementation for JavaScript/Web. +/// +/// On JS, only 32-bit integers are supported, so we use BigInt for 64-bit values. +/// Parameters are defined here: +/// https://reveng.sourceforge.io/crc-catalogue/all.htm#crc.cat.crc-64-nvme +/// https://nvmexpress.org/wp-content/uploads/NVM-Express-NVM-Command-Set-Specification-1.0d-2023.12.28-Ratified.pdf +class Crc64Nvme extends ParametricCrc { + Crc64Nvme() + : super( + 64, + BigInt.parse('ad93d23594c93659', radix: 16), + BigInt.parse('ffffffffffffffff', radix: 16), + BigInt.parse('ffffffffffffffff', radix: 16), + inputReflected: true, + outputReflected: true, + ); +} diff --git a/packages/smithy/smithy_aws/lib/src/http/interceptors/crc64nvme_vm.dart b/packages/smithy/smithy_aws/lib/src/http/interceptors/crc64nvme_vm.dart new file mode 100644 index 00000000000..80dfcd449a5 --- /dev/null +++ b/packages/smithy/smithy_aws/lib/src/http/interceptors/crc64nvme_vm.dart @@ -0,0 +1,23 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 + +import 'package:crclib/crclib.dart'; + +/// CRC-64/NVME implementation for Dart VM. +/// +/// On the VM, 64-bit integers are supported natively, so we use int. +/// Parameters are defined here: +/// https://reveng.sourceforge.io/crc-catalogue/all.htm#crc.cat.crc-64-nvme +/// https://nvmexpress.org/wp-content/uploads/NVM-Express-NVM-Command-Set-Specification-1.0d-2023.12.28-Ratified.pdf +class Crc64Nvme extends ParametricCrc { + Crc64Nvme() + : super( + 64, + // ignore: avoid_js_rounded_ints + 0xad93d23594c93659, + 0xffffffffffffffff, + 0xffffffffffffffff, + inputReflected: true, + outputReflected: true, + ); +} diff --git a/packages/smithy/smithy_aws/lib/src/http/interceptors/with_checksum.dart b/packages/smithy/smithy_aws/lib/src/http/interceptors/with_checksum.dart index e90280e6bdd..15220aa96b0 100644 --- a/packages/smithy/smithy_aws/lib/src/http/interceptors/with_checksum.dart +++ b/packages/smithy/smithy_aws/lib/src/http/interceptors/with_checksum.dart @@ -10,13 +10,20 @@ import 'package:crclib/catalog.dart'; import 'package:crclib/crclib.dart'; import 'package:crypto/crypto.dart'; import 'package:smithy/smithy.dart'; +import 'package:smithy_aws/src/http/interceptors/crc64nvme.dart'; class _CrcValueToHeaderConverter extends Converter { const _CrcValueToHeaderConverter(); @override String convert(CrcValue input) { - return base64Encode(hex.decode(input.toRadixString(16))); + // Convert to BigInt to ensure unsigned representation + final bigIntValue = input.toBigInt(); + final hexString = bigIntValue.toRadixString(16); + + // Pad with leading zero if odd length (hex.decode requires even length) + final paddedHex = hexString.length.isOdd ? '0$hexString' : hexString; + return base64Encode(hex.decode(paddedHex)); } @override @@ -91,18 +98,3 @@ class WithChecksum extends HttpRequestInterceptor { return request; } } - -// Parameters are defined here -// https://reveng.sourceforge.io/crc-catalogue/all.htm#crc.cat.crc-64-nvme -// https://nvmexpress.org/wp-content/uploads/NVM-Express-NVM-Command-Set-Specification-1.0d-2023.12.28-Ratified.pdf -class Crc64Nvme extends ParametricCrc { - Crc64Nvme() - : super( - 64, - BigInt.parse('ad93d23594c93659', radix: 16), - BigInt.parse('ffffffffffffffff', radix: 16), - BigInt.parse('ffffffffffffffff', radix: 16), - inputReflected: true, - outputReflected: true, - ); -} diff --git a/packages/smithy/smithy_aws/pubspec.yaml b/packages/smithy/smithy_aws/pubspec.yaml index b963453f936..895dd4fc909 100644 --- a/packages/smithy/smithy_aws/pubspec.yaml +++ b/packages/smithy/smithy_aws/pubspec.yaml @@ -11,12 +11,12 @@ environment: dependencies: aws_common: ">=0.7.11 <0.8.0" aws_signature_v4: ">=0.6.9 <0.7.0" - built_collection: ^5.0.0 + built_collection: ^5.1.1 built_value: ^8.10.1 collection: ^1.18.0 convert: ^3.0.1 crclib: ^3.0.0 - crypto: ^3.0.1 + crypto: ^3.0.7 intl: ^0.20.2 json_annotation: ^4.9.0 meta: ^1.16.0 @@ -26,11 +26,11 @@ dependencies: dev_dependencies: amplify_lints: ">=3.1.4 <3.2.0" - build_runner: ^2.4.9 + build_runner: ^2.4.15 built_value_generator: ^8.10.1 file: ^7.0.1 glob: ^2.1.0 - json_serializable: ">=6.9.4 <6.10.0" + json_serializable: ^6.11.0 pubspec_parse: ^1.2.2 test: ^1.22.1 yaml: ^3.1.1 diff --git a/packages/smithy/smithy_codegen/lib/src/util/pubspec.dart b/packages/smithy/smithy_codegen/lib/src/util/pubspec.dart index fb58900cb30..1bbe3273ba2 100644 --- a/packages/smithy/smithy_codegen/lib/src/util/pubspec.dart +++ b/packages/smithy/smithy_codegen/lib/src/util/pubspec.dart @@ -30,17 +30,17 @@ final dependencyVersions = { 'aws_common': const Dependency('^0.7.8', DependencyType.aws), 'aws_signature_v4': const Dependency('^0.6.6', DependencyType.aws), 'built_value': const Dependency('^8.10.1'), - 'built_collection': const Dependency('^5.0.0'), + 'built_collection': const Dependency('^5.1.1'), 'fixnum': const Dependency('^1.0.0'), 'meta': const Dependency('^1.16.0'), 'shelf': const Dependency('^1.4.0'), 'shelf_router': const Dependency('^1.1.3'), - 'xml': const Dependency('6.5.0'), + 'xml': const Dependency('^6.5.0'), // Dev Dependencies 'smithy_test': const Dependency.dev('^0.5.0', DependencyType.smithy), - 'build_runner': const Dependency.dev('^2.4.9'), - 'build_web_compilers': const Dependency.dev('^4.0.0'), + 'build_runner': const Dependency.dev('^2.4.15'), + 'build_web_compilers': const Dependency.dev('^4.1.4'), 'build_test': const Dependency.dev('^3.1.1'), 'built_value_generator': const Dependency.dev('^8.10.1'), 'lints': const Dependency.dev('^6.0.0'), diff --git a/packages/smithy/smithy_codegen/pubspec.yaml b/packages/smithy/smithy_codegen/pubspec.yaml index d92bef6ed4e..8632eb47ffd 100644 --- a/packages/smithy/smithy_codegen/pubspec.yaml +++ b/packages/smithy/smithy_codegen/pubspec.yaml @@ -19,16 +19,16 @@ dependencies: crclib: ^3.0.0 dart_style: ^3.0.1 fixnum: ^1.0.0 - grpc: ^4.0.0 + grpc: ^5.0.0 html2md: ^1.2.5 jmespath: ^2.0.0 json_annotation: ^4.9.0 meta: ^1.16.0 path: ^1.8.0 - protobuf: ^4.1.0 + protobuf: ^5.0.0 pub_semver: ^2.2.0 pubspec_parse: ^1.2.2 - shelf: ^1.1.0 + shelf: ^1.4.0 shelf_router: ^1.1.3 smithy: ">=0.7.1 <0.8.0" smithy_aws: ">=0.7.0 <0.8.0" @@ -39,11 +39,11 @@ dependencies: dev_dependencies: amplify_lints: ">=3.1.0 <3.2.0" build_cli: ^2.1.6 - build_runner: ^2.4.9 + build_runner: ^2.4.15 build_verify: ^3.0.0 build_version: ^2.1.1 built_value_generator: ^8.10.1 - json_serializable: ">=6.9.4 <6.10.0" + json_serializable: ^6.11.0 smithy_test: path: ../smithy_test test: ^1.22.1 diff --git a/packages/storage/amplify_storage_s3_dart/example/pubspec.yaml b/packages/storage/amplify_storage_s3_dart/example/pubspec.yaml index 01f1ddbf9c9..62c09e4c192 100644 --- a/packages/storage/amplify_storage_s3_dart/example/pubspec.yaml +++ b/packages/storage/amplify_storage_s3_dart/example/pubspec.yaml @@ -18,5 +18,5 @@ dependencies: dev_dependencies: amplify_lints: path: ../../../amplify_lints - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_download_data_plugin_options.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_download_data_plugin_options.g.dart index 6b928187872..ee9861963ab 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_download_data_plugin_options.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_download_data_plugin_options.g.dart @@ -28,7 +28,7 @@ S3DownloadDataPluginOptions _$S3DownloadDataPluginOptionsFromJson( Map _$S3DownloadDataPluginOptionsToJson( S3DownloadDataPluginOptions instance, ) => { - if (instance.bytesRange?.toJson() case final value?) 'bytesRange': value, + 'bytesRange': ?instance.bytesRange?.toJson(), 'getProperties': instance.getProperties, 'useAccelerateEndpoint': instance.useAccelerateEndpoint, }; diff --git a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_item.g.dart b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_item.g.dart index 2a8d70a3c37..1ec54bb7ed1 100644 --- a/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_item.g.dart +++ b/packages/storage/amplify_storage_s3_dart/lib/src/model/s3_item.g.dart @@ -32,11 +32,10 @@ S3Item _$S3ItemFromJson(Map json) => Map _$S3ItemToJson(S3Item instance) => { 'path': instance.path, - if (instance.size case final value?) 'size': value, - if (instance.lastModified?.toIso8601String() case final value?) - 'lastModified': value, - if (instance.eTag case final value?) 'eTag': value, + 'size': ?instance.size, + 'lastModified': ?instance.lastModified?.toIso8601String(), + 'eTag': ?instance.eTag, 'metadata': instance.metadata, - if (instance.versionId case final value?) 'versionId': value, - if (instance.contentType case final value?) 'contentType': value, + 'versionId': ?instance.versionId, + 'contentType': ?instance.contentType, }; diff --git a/packages/storage/amplify_storage_s3_dart/pubspec.yaml b/packages/storage/amplify_storage_s3_dart/pubspec.yaml index 0fbe9703fcb..9f3d5196da3 100644 --- a/packages/storage/amplify_storage_s3_dart/pubspec.yaml +++ b/packages/storage/amplify_storage_s3_dart/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: async: ^2.10.0 aws_common: ">=0.7.11 <0.8.0" aws_signature_v4: ">=0.6.9 <0.7.0" - built_collection: ^5.0.0 + built_collection: ^5.1.1 built_value: ^8.10.1 drift: ^2.25.0 fixnum: ^1.0.0 @@ -27,10 +27,10 @@ dependencies: dev_dependencies: amplify_lints: ">=3.1.4 <3.2.0" - build_runner: ^2.4.9 + build_runner: ^2.4.15 build_verify: ^3.0.0 built_value_generator: ^8.10.1 drift_dev: ^2.25.1 - json_serializable: ">=6.9.4 <6.10.0" + json_serializable: ^6.11.0 mocktail: ^1.0.0 test: ^1.22.1 diff --git a/packages/test/amplify_auth_integration_test/pubspec.yaml b/packages/test/amplify_auth_integration_test/pubspec.yaml index 0d1fd3ce20d..750d108bf4f 100644 --- a/packages/test/amplify_auth_integration_test/pubspec.yaml +++ b/packages/test/amplify_auth_integration_test/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: amplify_flutter: any amplify_integration_test: any async: ^2.10.0 - collection: any + collection: ^1.18.0 flutter: sdk: flutter flutter_test: diff --git a/packages/test/amplify_integration_test/pubspec.yaml b/packages/test/amplify_integration_test/pubspec.yaml index 21f51ab5670..77dd1153d4c 100644 --- a/packages/test/amplify_integration_test/pubspec.yaml +++ b/packages/test/amplify_integration_test/pubspec.yaml @@ -14,10 +14,10 @@ dependencies: async: ^2.10.0 aws_common: any aws_signature_v4: any - built_collection: ^5.0.0 + built_collection: ^5.1.1 built_value: ^8.10.1 collection: ^1.18.0 - meta: ^1.8.0 + meta: ^1.16.0 smithy: any smithy_aws: any stream_transform: ^2.1.0 @@ -25,5 +25,5 @@ dependencies: dev_dependencies: amplify_lints: ^3.1.0 - build_runner: ^2.4.9 + build_runner: ^2.4.15 built_value_generator: ^8.10.1 diff --git a/packages/test/amplify_test/pubspec.yaml b/packages/test/amplify_test/pubspec.yaml index 279f676fd6a..1eec03d78fe 100644 --- a/packages/test/amplify_test/pubspec.yaml +++ b/packages/test/amplify_test/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: amplify_core: any aws_common: any collection: ^1.18.0 - meta: ^1.8.0 + meta: ^1.16.0 dev_dependencies: amplify_lints: any diff --git a/packages/test/pub_server/pubspec.yaml b/packages/test/pub_server/pubspec.yaml index fbd24834506..be1540ac670 100644 --- a/packages/test/pub_server/pubspec.yaml +++ b/packages/test/pub_server/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: async: ^2.10.0 aws_common: any collection: ^1.18.0 - crypto: ^3.0.6 + crypto: ^3.0.7 drift: ^2.25.0 file: ^7.0.1 git: ^2.2.0 @@ -31,9 +31,9 @@ dependencies: dev_dependencies: amplify_lints: ">=2.0.3 <2.1.0" - build_runner: ^2.4.9 + build_runner: ^2.4.15 drift_dev: ^2.25.1 - json_serializable: ">=6.9.4 <6.10.0" + json_serializable: ^6.11.0 pub_api_client: ^3.1.1 shelf_router_generator: ^1.0.5 test: ^1.22.1 diff --git a/packages/worker_bee/e2e/lib/e2e_worker.worker.dart b/packages/worker_bee/e2e/lib/e2e_worker.worker.dart index 5c53f44e6b4..924b3e53bfd 100644 --- a/packages/worker_bee/e2e/lib/e2e_worker.worker.dart +++ b/packages/worker_bee/e2e/lib/e2e_worker.worker.dart @@ -1,5 +1,5 @@ -// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 // ************************************************************************** // WorkerBeeGenerator diff --git a/packages/worker_bee/e2e/lib/e2e_worker_no_result.worker.dart b/packages/worker_bee/e2e/lib/e2e_worker_no_result.worker.dart index 895142ee6aa..7952b1c7de1 100644 --- a/packages/worker_bee/e2e/lib/e2e_worker_no_result.worker.dart +++ b/packages/worker_bee/e2e/lib/e2e_worker_no_result.worker.dart @@ -1,5 +1,5 @@ -// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 // ************************************************************************** // WorkerBeeGenerator diff --git a/packages/worker_bee/e2e/lib/e2e_worker_null_result.worker.dart b/packages/worker_bee/e2e/lib/e2e_worker_null_result.worker.dart index 069daca36a5..9049f6e6318 100644 --- a/packages/worker_bee/e2e/lib/e2e_worker_null_result.worker.dart +++ b/packages/worker_bee/e2e/lib/e2e_worker_null_result.worker.dart @@ -1,5 +1,5 @@ -// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 // ************************************************************************** // WorkerBeeGenerator diff --git a/packages/worker_bee/e2e/lib/e2e_worker_throws.worker.dart b/packages/worker_bee/e2e/lib/e2e_worker_throws.worker.dart index cf474f39450..e834b4ee3e8 100644 --- a/packages/worker_bee/e2e/lib/e2e_worker_throws.worker.dart +++ b/packages/worker_bee/e2e/lib/e2e_worker_throws.worker.dart @@ -1,5 +1,5 @@ -// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 // ************************************************************************** // WorkerBeeGenerator diff --git a/packages/worker_bee/e2e/lib/e2e_worker_void_result.worker.dart b/packages/worker_bee/e2e/lib/e2e_worker_void_result.worker.dart index e9618b626f2..3daa9e3228f 100644 --- a/packages/worker_bee/e2e/lib/e2e_worker_void_result.worker.dart +++ b/packages/worker_bee/e2e/lib/e2e_worker_void_result.worker.dart @@ -1,5 +1,5 @@ -// dart format width=80 // GENERATED CODE - DO NOT MODIFY BY HAND +// dart format width=80 // ************************************************************************** // WorkerBeeGenerator diff --git a/packages/worker_bee/e2e/pubspec.yaml b/packages/worker_bee/e2e/pubspec.yaml index 09d4bb99ad5..791d92f3b92 100644 --- a/packages/worker_bee/e2e/pubspec.yaml +++ b/packages/worker_bee/e2e/pubspec.yaml @@ -7,7 +7,7 @@ environment: dependencies: aws_common: ">=0.4.0 <0.5.0" - built_collection: ^5.0.0 + built_collection: ^5.1.1 built_value: ^8.10.1 fixnum: ^1.0.0 meta: ^1.16.0 @@ -23,9 +23,9 @@ dependency_overrides: dev_dependencies: amplify_lints: path: ../../amplify_lints - build_runner: ^2.4.9 + build_runner: ^2.4.15 build_verify: ^3.0.0 - build_web_compilers: ^4.0.0 + build_web_compilers: ^4.1.4 built_value_generator: ^8.10.1 worker_bee_builder: path: ../worker_bee_builder diff --git a/packages/worker_bee/e2e_test/pubspec.yaml b/packages/worker_bee/e2e_test/pubspec.yaml index cebfddf706d..63072c16e3f 100644 --- a/packages/worker_bee/e2e_test/pubspec.yaml +++ b/packages/worker_bee/e2e_test/pubspec.yaml @@ -18,10 +18,10 @@ dev_dependencies: amplify_lints: path: ../../amplify_lints aws_common: ">=0.4.0 <0.5.0" - build_runner: ^2.4.9 + build_runner: ^2.4.15 build_test: ^3.1.1 - build_web_compilers: ^4.0.0 - built_collection: ^5.0.0 + build_web_compilers: ^4.1.4 + built_collection: ^5.1.1 built_value: ^8.10.1 built_value_generator: ^8.10.1 e2e: diff --git a/packages/worker_bee/worker_bee/pubspec.yaml b/packages/worker_bee/worker_bee/pubspec.yaml index 983b9ccd1b1..e298e37406f 100644 --- a/packages/worker_bee/worker_bee/pubspec.yaml +++ b/packages/worker_bee/worker_bee/pubspec.yaml @@ -11,7 +11,7 @@ environment: dependencies: async: ^2.10.0 aws_common: ">=0.7.11 <0.8.0" - built_collection: ^5.0.0 + built_collection: ^5.1.1 built_value: ^8.10.1 collection: ^1.18.0 meta: ^1.16.0 @@ -23,6 +23,6 @@ dependencies: dev_dependencies: amplify_lints: ">=3.1.4 <3.2.0" - build_runner: ^2.4.9 + build_runner: ^2.4.15 built_value_generator: ^8.10.1 test: ^1.22.1 diff --git a/packages/worker_bee/worker_bee_builder/lib/src/impl/common.dart b/packages/worker_bee/worker_bee_builder/lib/src/impl/common.dart index 4a958794ff5..a5e472ac213 100644 --- a/packages/worker_bee/worker_bee_builder/lib/src/impl/common.dart +++ b/packages/worker_bee/worker_bee_builder/lib/src/impl/common.dart @@ -35,9 +35,9 @@ class WorkerImpl { abstract class ImplGenerator { /// {@macro worker_bee_builder.impl_generator} ImplGenerator(this.workerEl, this.requestEl, this.responseEl) { - workerName = workerEl.name; + workerName = workerEl.name!; workerImplName = '${workerName}Impl'; - workerType = Reference(workerName, workerEl.librarySource.uri.toString()); + workerType = Reference(workerName, workerEl.library.uri.toString()); _checkCtors(workerEl.constructors); requestType = requestEl.thisType.accept(symbolVisitor); diff --git a/packages/worker_bee/worker_bee_builder/lib/src/type_visitor.dart b/packages/worker_bee/worker_bee_builder/lib/src/type_visitor.dart index fcbafd39006..b239d72e883 100644 --- a/packages/worker_bee/worker_bee_builder/lib/src/type_visitor.dart +++ b/packages/worker_bee/worker_bee_builder/lib/src/type_visitor.dart @@ -24,7 +24,7 @@ class SymbolVisitor extends UnifyingTypeVisitor { t ..isNullable = type.nullabilitySuffix != NullabilitySuffix.none ..symbol = type.element.name - ..url = type.element.librarySource.uri.toString() + ..url = type.element.library.uri.toString() ..types.addAll([ for (final typeArg in type.typeArguments) typeArg.accept(this), ]); diff --git a/packages/worker_bee/worker_bee_builder/pubspec.yaml b/packages/worker_bee/worker_bee_builder/pubspec.yaml index 2f0a2ba6f3d..4c9548282a5 100644 --- a/packages/worker_bee/worker_bee_builder/pubspec.yaml +++ b/packages/worker_bee/worker_bee_builder/pubspec.yaml @@ -9,16 +9,16 @@ environment: sdk: ^3.9.0 dependencies: - analyzer: ">=7.3.0 <7.4.0" + analyzer: ^9.0.0 async: ^2.10.0 - build: ^2.3.0 + build: ^4.0.0 code_builder: ^4.10.1 collection: ^1.18.0 dart_style: ^3.0.1 meta: ^1.16.0 path: ^1.8.0 pub_semver: ^2.2.0 - source_gen: ^2.0.0 + source_gen: ^4.0.0 stream_channel: ^2.1.0 tuple: ^2.0.0 worker_bee: ">=0.3.8 <0.4.0" diff --git a/pubspec.yaml b/pubspec.yaml index 92fb135e67b..f5bffcac360 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,8 +15,8 @@ environment: # tool. dependencies: async: ^2.10.0 - build_runner: ^2.4.9 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 built_value: ^8.10.1 built_value_generator: ^8.10.1 code_builder: ^4.10.1 @@ -34,13 +34,13 @@ dependencies: http: ^1.3.0 intl: ^0.20.2 json_annotation: ^4.9.0 - json_serializable: ">=6.9.4 <6.10.0" + json_serializable: ^6.11.0 mime: ^2.0.0 oauth2: ^2.0.2 package_info_plus: ^9.0.0 - pigeon: ^25.5.0 + pigeon: ^26.0.0 sqlite3: ^2.7.6 - source_gen: ^2.0.0 + source_gen: ^4.0.0 stack_trace: ^1.10.0 uuid: ^4.5.1 win32: ^5.14.0 diff --git a/templates/dart-package/__brick__/example/pubspec.yaml b/templates/dart-package/__brick__/example/pubspec.yaml index 98a38cf3d6a..5a096213078 100644 --- a/templates/dart-package/__brick__/example/pubspec.yaml +++ b/templates/dart-package/__brick__/example/pubspec.yaml @@ -11,5 +11,5 @@ dependencies: dev_dependencies: amplify_lints: ^3.1.0 - build_runner: ^2.1.4 - build_web_compilers: ^4.0.0 + build_runner: ^2.4.15 + build_web_compilers: ^4.1.4 diff --git a/templates/dart-package/__brick__/pubspec.yaml b/templates/dart-package/__brick__/pubspec.yaml index d3050bb6102..22bea562de4 100644 --- a/templates/dart-package/__brick__/pubspec.yaml +++ b/templates/dart-package/__brick__/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: dev_dependencies: amplify_lints: ^3.1.0 - build_runner: ^2.0.0 + build_runner: ^2.4.15 build_test: ^3.1.1 - build_web_compilers: ^4.0.0 + build_web_compilers: ^4.1.4 test: ^1.22.1