From d72368f246bca74b342328182a9b5be6fe7a9808 Mon Sep 17 00:00:00 2001 From: tarrinneal Date: Tue, 2 Apr 2024 10:11:11 -0700 Subject: [PATCH 1/2] everything --- packages/pigeon/CHANGELOG.md | 5 + packages/pigeon/README.md | 5 + packages/pigeon/example/README.md | 2 +- .../java/io/flutter/plugins/Messages.java | 27 +- .../flutter/pigeon_example_app/Messages.g.kt | 24 +- .../example/app/ios/Runner/Messages.g.swift | 18 +- packages/pigeon/example/app/lib/main.dart | 2 +- .../example/app/lib/src/messages.g.dart | 32 +- .../example/app/macos/Runner/messages.g.h | 6 + .../example/app/macos/Runner/messages.g.m | 41 +- .../example/app/windows/runner/messages.g.cpp | 31 +- .../example/app/windows/runner/messages.g.h | 6 + packages/pigeon/lib/cpp_generator.dart | 85 +- packages/pigeon/lib/dart_generator.dart | 43 +- packages/pigeon/lib/generator_tools.dart | 2 +- packages/pigeon/lib/java_generator.dart | 22 +- packages/pigeon/lib/kotlin_generator.dart | 25 +- packages/pigeon/lib/objc_generator.dart | 33 +- packages/pigeon/lib/swift_generator.dart | 18 +- packages/pigeon/pigeons/core_tests.dart | 7 +- .../AlternateLanguageTestPlugin.java | 65 ++ .../CoreTests.java | 417 ++++++--- .../ios/Classes/AlternateLanguageTestPlugin.h | 5 + .../ios/Classes/AlternateLanguageTestPlugin.m | 59 ++ .../ios/Classes/CoreTests.gen.h | 19 + .../ios/Classes/CoreTests.gen.m | 812 +++++++++++++----- .../Classes/AlternateLanguageTestPlugin.h | 5 + .../Classes/AlternateLanguageTestPlugin.m | 57 ++ .../macos/Classes/CoreTests.gen.h | 19 + .../macos/Classes/CoreTests.gen.m | 810 ++++++++++++----- .../lib/integration_tests.dart | 72 +- .../background_platform_channels.gen.dart | 13 +- .../lib/src/generated/core_tests.gen.dart | 477 +++++----- .../lib/src/generated/enum.gen.dart | 23 +- .../src/generated/flutter_unittests.gen.dart | 24 +- .../lib/src/generated/message.gen.dart | 41 +- .../lib/src/generated/multiple_arity.gen.dart | 24 +- .../src/generated/non_null_fields.gen.dart | 24 +- .../lib/src/generated/null_fields.gen.dart | 24 +- .../src/generated/nullable_returns.gen.dart | 96 ++- .../lib/src/generated/primitive.gen.dart | 72 +- .../test/null_safe_test.dart | 16 +- .../test/primitive_test.dart | 2 +- .../com/example/test_plugin/CoreTests.gen.kt | 349 +++++--- .../com/example/test_plugin/TestPlugin.kt | 40 +- .../ios/Runner.xcodeproj/project.pbxproj | 2 +- .../example/ios/RunnerTests/RunnerTests.swift | 5 +- .../ios/Classes/CoreTests.gen.swift | 320 ++++--- .../test_plugin/ios/Classes/TestPlugin.swift | 54 ++ .../macos/Classes/CoreTests.gen.swift | 320 ++++--- .../macos/Classes/TestPlugin.swift | 54 ++ .../windows/pigeon/core_tests.gen.cpp | 454 +++++++--- .../windows/pigeon/core_tests.gen.h | 18 + .../test_plugin/windows/test_plugin.cpp | 67 +- .../test_plugin/windows/test_plugin.h | 32 +- packages/pigeon/pubspec.yaml | 2 +- packages/pigeon/test/dart_generator_test.dart | 2 +- packages/pigeon/test/java_generator_test.dart | 2 +- .../pigeon/test/kotlin_generator_test.dart | 6 +- .../pigeon/test/swift_generator_test.dart | 5 +- 60 files changed, 3844 insertions(+), 1498 deletions(-) diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md index be39b24414c6..fb01483089c5 100644 --- a/packages/pigeon/CHANGELOG.md +++ b/packages/pigeon/CHANGELOG.md @@ -1,3 +1,8 @@ +## 18.0.0 + +* Adds message channel suffix option to all APIs. +* **Breaking Change** [dart] Changes `FlutterApi` `setup` to `setUp`. + ## 17.3.0 * [swift] Adds `@SwiftClass` annotation to allow choice between `struct` and `class` for data classes. diff --git a/packages/pigeon/README.md b/packages/pigeon/README.md index 8e1edaa30df2..dfa4e9847d7b 100644 --- a/packages/pigeon/README.md +++ b/packages/pigeon/README.md @@ -75,6 +75,11 @@ When targeting a Flutter version that supports the the threading model for handling HostApi methods can be selected with the `TaskQueue` annotation. +### Multi-Instance Support + +Host and Flutter APIs now support the ability to provide a unique message channel suffix string +to the api to allow for multiple instances to be created and operate in parallel. + ## Usage 1) Add pigeon as a `dev_dependency`. diff --git a/packages/pigeon/example/README.md b/packages/pigeon/example/README.md index b9ff98aca352..8e22079b47ad 100644 --- a/packages/pigeon/example/README.md +++ b/packages/pigeon/example/README.md @@ -223,7 +223,7 @@ class _ExampleFlutterApi implements MessageFlutterApi { } } // ยทยทยท - MessageFlutterApi.setup(_ExampleFlutterApi()); + MessageFlutterApi.setUp(_ExampleFlutterApi()); ``` ### Swift diff --git a/packages/pigeon/example/app/android/app/src/main/java/io/flutter/plugins/Messages.java b/packages/pigeon/example/app/android/app/src/main/java/io/flutter/plugins/Messages.java index 1167e53d5fb8..897f40e9beed 100644 --- a/packages/pigeon/example/app/android/app/src/main/java/io/flutter/plugins/Messages.java +++ b/packages/pigeon/example/app/android/app/src/main/java/io/flutter/plugins/Messages.java @@ -268,11 +268,20 @@ public interface ExampleHostApi { } /** Sets up an instance of `ExampleHostApi` to handle messages through the `binaryMessenger`. */ static void setUp(@NonNull BinaryMessenger binaryMessenger, @Nullable ExampleHostApi api) { + setUp(binaryMessenger, "", api); + } + + static void setUp( + @NonNull BinaryMessenger binaryMessenger, + @NonNull String messageChannelSuffix, + @Nullable ExampleHostApi api) { + messageChannelSuffix = messageChannelSuffix.isEmpty() ? "" : "." + messageChannelSuffix; { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.getHostLanguage", + "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.getHostLanguage" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -295,7 +304,8 @@ static void setUp(@NonNull BinaryMessenger binaryMessenger, @Nullable ExampleHos BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.add", + "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.add" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -324,7 +334,8 @@ static void setUp(@NonNull BinaryMessenger binaryMessenger, @Nullable ExampleHos BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.sendMessage", + "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.sendMessage" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -356,9 +367,16 @@ public void error(Throwable error) { /** Generated class from Pigeon that represents Flutter messages that can be called from Java. */ public static class MessageFlutterApi { private final @NonNull BinaryMessenger binaryMessenger; + private final String messageChannelSuffix; public MessageFlutterApi(@NonNull BinaryMessenger argBinaryMessenger) { + this(argBinaryMessenger, ""); + } + + public MessageFlutterApi( + @NonNull BinaryMessenger argBinaryMessenger, @NonNull String messageChannelSuffix) { this.binaryMessenger = argBinaryMessenger; + this.messageChannelSuffix = messageChannelSuffix.isEmpty() ? "" : "." + messageChannelSuffix; } /** Public interface for sending reply. */ @@ -369,7 +387,8 @@ public MessageFlutterApi(@NonNull BinaryMessenger argBinaryMessenger) { public void flutterMethod(@Nullable String aStringArg, @NonNull Result result) { final String channelName = - "dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod"; + "dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( diff --git a/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/Messages.g.kt b/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/Messages.g.kt index 00e48beba91b..350895738d62 100644 --- a/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/Messages.g.kt +++ b/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/Messages.g.kt @@ -119,12 +119,18 @@ interface ExampleHostApi { val codec: MessageCodec by lazy { ExampleHostApiCodec } /** Sets up an instance of `ExampleHostApi` to handle messages through the `binaryMessenger`. */ @Suppress("UNCHECKED_CAST") - fun setUp(binaryMessenger: BinaryMessenger, api: ExampleHostApi?) { + fun setUp( + binaryMessenger: BinaryMessenger, + api: ExampleHostApi?, + messageChannelSuffix: String = "" + ) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" run { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.getHostLanguage", + "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.getHostLanguage$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> @@ -144,7 +150,7 @@ interface ExampleHostApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.add", + "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.add$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -167,7 +173,7 @@ interface ExampleHostApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.sendMessage", + "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.sendMessage$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -192,14 +198,20 @@ interface ExampleHostApi { } /** Generated class from Pigeon that represents Flutter messages that can be called from Kotlin. */ @Suppress("UNCHECKED_CAST") -class MessageFlutterApi(private val binaryMessenger: BinaryMessenger) { +class MessageFlutterApi( + private val binaryMessenger: BinaryMessenger, + private val messageChannelSuffix: String = "" +) { companion object { /** The codec used by MessageFlutterApi. */ val codec: MessageCodec by lazy { StandardMessageCodec() } } fun flutterMethod(aStringArg: String?, callback: (Result) -> Unit) { - val channelName = "dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod" + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" + val channelName = + "dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(aStringArg)) { if (it is List<*>) { diff --git a/packages/pigeon/example/app/ios/Runner/Messages.g.swift b/packages/pigeon/example/app/ios/Runner/Messages.g.swift index 3acc38b2cb6d..313c1974e024 100644 --- a/packages/pigeon/example/app/ios/Runner/Messages.g.swift +++ b/packages/pigeon/example/app/ios/Runner/Messages.g.swift @@ -131,9 +131,13 @@ class ExampleHostApiSetup { /// The codec used by ExampleHostApi. static var codec: FlutterStandardMessageCodec { ExampleHostApiCodec.shared } /// Sets up an instance of `ExampleHostApi` to handle messages through the `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: ExampleHostApi?) { + static func setUp( + binaryMessenger: FlutterBinaryMessenger, api: ExampleHostApi?, messageChannelSuffix: String = "" + ) { + let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let getHostLanguageChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.getHostLanguage", + name: + "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.getHostLanguage\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { getHostLanguageChannel.setMessageHandler { _, reply in @@ -148,7 +152,7 @@ class ExampleHostApiSetup { getHostLanguageChannel.setMessageHandler(nil) } let addChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.add", + name: "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.add\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { addChannel.setMessageHandler { message, reply in @@ -166,7 +170,7 @@ class ExampleHostApiSetup { addChannel.setMessageHandler(nil) } let sendMessageChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.sendMessage", + name: "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.sendMessage\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { sendMessageChannel.setMessageHandler { message, reply in @@ -193,14 +197,16 @@ protocol MessageFlutterApiProtocol { } class MessageFlutterApi: MessageFlutterApiProtocol { private let binaryMessenger: FlutterBinaryMessenger - init(binaryMessenger: FlutterBinaryMessenger) { + private let messageChannelSuffix: String + init(binaryMessenger: FlutterBinaryMessenger, messageChannelSuffix: String = "") { self.binaryMessenger = binaryMessenger + self.messageChannelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" } func flutterMethod( aString aStringArg: String?, completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod" + "dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel(name: channelName, binaryMessenger: binaryMessenger) channel.sendMessage([aStringArg] as [Any?]) { response in guard let listResponse = response as? [Any?] else { diff --git a/packages/pigeon/example/app/lib/main.dart b/packages/pigeon/example/app/lib/main.dart index ea90231c7565..7f318d63d50d 100644 --- a/packages/pigeon/example/app/lib/main.dart +++ b/packages/pigeon/example/app/lib/main.dart @@ -20,7 +20,7 @@ class _ExampleFlutterApi implements MessageFlutterApi { void main() { // #docregion main-dart-flutter - MessageFlutterApi.setup(_ExampleFlutterApi()); + MessageFlutterApi.setUp(_ExampleFlutterApi()); // #enddocregion main-dart-flutter runApp(const MyApp()); } diff --git a/packages/pigeon/example/app/lib/src/messages.g.dart b/packages/pigeon/example/app/lib/src/messages.g.dart index 59213e4ef2bb..071711ffaa96 100644 --- a/packages/pigeon/example/app/lib/src/messages.g.dart +++ b/packages/pigeon/example/app/lib/src/messages.g.dart @@ -97,16 +97,21 @@ class ExampleHostApi { /// Constructor for [ExampleHostApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - ExampleHostApi({BinaryMessenger? binaryMessenger}) - : __pigeon_binaryMessenger = binaryMessenger; + ExampleHostApi( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : __pigeon_binaryMessenger = binaryMessenger, + __pigeon_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? __pigeon_binaryMessenger; static const MessageCodec pigeonChannelCodec = _ExampleHostApiCodec(); + final String __pigeon_messageChannelSuffix; + Future getHostLanguage() async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.getHostLanguage'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.getHostLanguage$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -134,8 +139,8 @@ class ExampleHostApi { } Future add(int a, int b) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.add'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.add$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -163,8 +168,8 @@ class ExampleHostApi { } Future sendMessage(MessageData message) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.sendMessage'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.sendMessage$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -198,12 +203,17 @@ abstract class MessageFlutterApi { String flutterMethod(String? aString); - static void setup(MessageFlutterApi? api, - {BinaryMessenger? binaryMessenger}) { + static void setUp( + MessageFlutterApi? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod', + 'dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { diff --git a/packages/pigeon/example/app/macos/Runner/messages.g.h b/packages/pigeon/example/app/macos/Runner/messages.g.h index bba1ff2deb07..db20dcba17ee 100644 --- a/packages/pigeon/example/app/macos/Runner/messages.g.h +++ b/packages/pigeon/example/app/macos/Runner/messages.g.h @@ -56,11 +56,17 @@ NSObject *PGNExampleHostApiGetCodec(void); extern void SetUpPGNExampleHostApi(id binaryMessenger, NSObject *_Nullable api); +extern void SetUpPGNExampleHostApiWithSuffix(id binaryMessenger, + NSObject *_Nullable api, + NSString *messageChannelSuffix); + /// The codec used by PGNMessageFlutterApi. NSObject *PGNMessageFlutterApiGetCodec(void); @interface PGNMessageFlutterApi : NSObject - (instancetype)initWithBinaryMessenger:(id)binaryMessenger; +- (instancetype)initWithBinaryMessenger:(id)binaryMessenger + messageChannelSuffix:(nullable NSString *)messageChannelSuffix; - (void)flutterMethodAString:(nullable NSString *)aString completion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion; @end diff --git a/packages/pigeon/example/app/macos/Runner/messages.g.m b/packages/pigeon/example/app/macos/Runner/messages.g.m index 90983b10cd22..90bd065401c9 100644 --- a/packages/pigeon/example/app/macos/Runner/messages.g.m +++ b/packages/pigeon/example/app/macos/Runner/messages.g.m @@ -138,9 +138,21 @@ - (FlutterStandardReader *)readerWithData:(NSData *)data { void SetUpPGNExampleHostApi(id binaryMessenger, NSObject *api) { + SetUpPGNExampleHostApiWithSuffix(binaryMessenger, api, @""); +} + +void SetUpPGNExampleHostApiWithSuffix(id binaryMessenger, + NSObject *api, + NSString *messageChannelSuffix) { + messageChannelSuffix = messageChannelSuffix.length > 0 + ? [NSString stringWithFormat:@".%@", messageChannelSuffix] + : @""; { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.getHostLanguage" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_example_package." + @"ExampleHostApi.getHostLanguage", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:PGNExampleHostApiGetCodec()]; if (api) { @@ -159,7 +171,11 @@ void SetUpPGNExampleHostApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.add" + initWithName: + [NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.add", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:PGNExampleHostApiGetCodec()]; if (api) { @@ -181,7 +197,10 @@ void SetUpPGNExampleHostApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.sendMessage" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_example_package." + @"ExampleHostApi.sendMessage", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:PGNExampleHostApiGetCodec()]; if (api) { @@ -210,21 +229,31 @@ void SetUpPGNExampleHostApi(id binaryMessenger, @interface PGNMessageFlutterApi () @property(nonatomic, strong) NSObject *binaryMessenger; +@property(nonatomic, strong) NSString *messageChannelSuffix; @end @implementation PGNMessageFlutterApi - (instancetype)initWithBinaryMessenger:(NSObject *)binaryMessenger { - self = [super init]; + return [self initWithBinaryMessenger:binaryMessenger messageChannelSuffix:@""]; +} +- (instancetype)initWithBinaryMessenger:(NSObject *)binaryMessenger + messageChannelSuffix:(nullable NSString *)messageChannelSuffix { + self = [self init]; if (self) { _binaryMessenger = binaryMessenger; + _messageChannelSuffix = [messageChannelSuffix length] == 0 + ? @"" + : [NSString stringWithFormat:@".%@", messageChannelSuffix]; } return self; } - (void)flutterMethodAString:(nullable NSString *)arg_aString completion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod"; + NSString *channelName = [NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger diff --git a/packages/pigeon/example/app/windows/runner/messages.g.cpp b/packages/pigeon/example/app/windows/runner/messages.g.cpp index 97d11da0bdf8..5f6e25a18db8 100644 --- a/packages/pigeon/example/app/windows/runner/messages.g.cpp +++ b/packages/pigeon/example/app/windows/runner/messages.g.cpp @@ -140,10 +140,21 @@ const flutter::StandardMessageCodec& ExampleHostApi::GetCodec() { // `binary_messenger`. void ExampleHostApi::SetUp(flutter::BinaryMessenger* binary_messenger, ExampleHostApi* api) { + ExampleHostApi::SetUp(binary_messenger, api, ""); +} + +void ExampleHostApi::SetUp(flutter::BinaryMessenger* binary_messenger, + ExampleHostApi* api, + const std::string& message_channel_suffix) { + const std::string prepended_suffix = + message_channel_suffix.length() > 0 + ? std::string(".") + message_channel_suffix + : ""; { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_example_package." - "ExampleHostApi.getHostLanguage", + "ExampleHostApi.getHostLanguage" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -169,7 +180,8 @@ void ExampleHostApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel( binary_messenger, - "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.add", + "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.add" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -208,7 +220,8 @@ void ExampleHostApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel( binary_messenger, - "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.sendMessage", + "dev.flutter.pigeon.pigeon_example_package.ExampleHostApi.sendMessage" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -258,7 +271,14 @@ EncodableValue ExampleHostApi::WrapError(const FlutterError& error) { // Generated class from Pigeon that represents Flutter messages that can be // called from C++. MessageFlutterApi::MessageFlutterApi(flutter::BinaryMessenger* binary_messenger) - : binary_messenger_(binary_messenger) {} + : binary_messenger_(binary_messenger), message_channel_suffix_("") {} + +MessageFlutterApi::MessageFlutterApi(flutter::BinaryMessenger* binary_messenger, + const std::string& message_channel_suffix) + : binary_messenger_(binary_messenger), + message_channel_suffix_(message_channel_suffix.length() > 0 + ? std::string(".") + message_channel_suffix + : "") {} const flutter::StandardMessageCodec& MessageFlutterApi::GetCodec() { return flutter::StandardMessageCodec::GetInstance( @@ -271,7 +291,8 @@ void MessageFlutterApi::FlutterMethod( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi." - "flutterMethod"; + "flutterMethod" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ a_string_arg ? EncodableValue(*a_string_arg) : EncodableValue(), diff --git a/packages/pigeon/example/app/windows/runner/messages.g.h b/packages/pigeon/example/app/windows/runner/messages.g.h index 92ab57e3176e..1b9ca3626cbb 100644 --- a/packages/pigeon/example/app/windows/runner/messages.g.h +++ b/packages/pigeon/example/app/windows/runner/messages.g.h @@ -132,6 +132,9 @@ class ExampleHostApi { // `binary_messenger`. static void SetUp(flutter::BinaryMessenger* binary_messenger, ExampleHostApi* api); + static void SetUp(flutter::BinaryMessenger* binary_messenger, + ExampleHostApi* api, + const std::string& message_channel_suffix); static flutter::EncodableValue WrapError(std::string_view error_message); static flutter::EncodableValue WrapError(const FlutterError& error); @@ -143,6 +146,8 @@ class ExampleHostApi { class MessageFlutterApi { public: MessageFlutterApi(flutter::BinaryMessenger* binary_messenger); + MessageFlutterApi(flutter::BinaryMessenger* binary_messenger, + const std::string& message_channel_suffix); static const flutter::StandardMessageCodec& GetCodec(); void FlutterMethod(const std::string* a_string, std::function&& on_success, @@ -150,6 +155,7 @@ class MessageFlutterApi { private: flutter::BinaryMessenger* binary_messenger_; + std::string message_channel_suffix_; }; } // namespace pigeon_example diff --git a/packages/pigeon/lib/cpp_generator.dart b/packages/pigeon/lib/cpp_generator.dart index 5e993137b9f4..92d6fd56d1fc 100644 --- a/packages/pigeon/lib/cpp_generator.dart +++ b/packages/pigeon/lib/cpp_generator.dart @@ -368,8 +368,13 @@ class CppHeaderGenerator extends StructuredGenerator { indent.write('class ${api.name} '); indent.addScoped('{', '};', () { _writeAccessBlock(indent, _ClassAccess.public, () { - _writeFunctionDeclaration(indent, api.name, - parameters: ['flutter::BinaryMessenger* binary_messenger']); + _writeFunctionDeclaration(indent, api.name, parameters: [ + 'flutter::BinaryMessenger* binary_messenger', + ]); + _writeFunctionDeclaration(indent, api.name, parameters: [ + 'flutter::BinaryMessenger* binary_messenger', + 'const std::string& message_channel_suffix', + ]); _writeFunctionDeclaration(indent, 'GetCodec', returnType: 'const flutter::StandardMessageCodec&', isStatic: true); for (final Method func in api.methods) { @@ -396,6 +401,7 @@ class CppHeaderGenerator extends StructuredGenerator { }); indent.addScoped(' private:', null, () { indent.writeln('flutter::BinaryMessenger* binary_messenger_;'); + indent.writeln('std::string message_channel_suffix_;'); }); }, nestCount: 0); indent.newln(); @@ -479,6 +485,14 @@ class CppHeaderGenerator extends StructuredGenerator { 'flutter::BinaryMessenger* binary_messenger', '${api.name}* api', ]); + _writeFunctionDeclaration(indent, 'SetUp', + returnType: _voidType, + isStatic: true, + parameters: [ + 'flutter::BinaryMessenger* binary_messenger', + '${api.name}* api', + 'const std::string& message_channel_suffix', + ]); _writeFunctionDeclaration(indent, 'WrapError', returnType: 'flutter::EncodableValue', isStatic: true, @@ -873,19 +887,44 @@ class CppSourceGenerator extends StructuredGenerator { } indent.writeln( '$_commentPrefix Generated class from Pigeon that represents Flutter messages that can be called from C++.'); - _writeFunctionDefinition(indent, api.name, - scope: api.name, - parameters: ['flutter::BinaryMessenger* binary_messenger'], - initializers: ['binary_messenger_(binary_messenger)']); + _writeFunctionDefinition( + indent, + api.name, + scope: api.name, + parameters: [ + 'flutter::BinaryMessenger* binary_messenger', + ], + initializers: [ + 'binary_messenger_(binary_messenger)', + 'message_channel_suffix_("")' + ], + ); + _writeFunctionDefinition( + indent, + api.name, + scope: api.name, + parameters: [ + 'flutter::BinaryMessenger* binary_messenger', + 'const std::string& message_channel_suffix' + ], + initializers: [ + 'binary_messenger_(binary_messenger)', + 'message_channel_suffix_(message_channel_suffix.length() > 0 ? std::string(".") + message_channel_suffix : "")' + ], + ); final String codeSerializerName = getCodecClasses(api, root).isNotEmpty ? _getCodecSerializerName(api) : _defaultCodecSerializer; - _writeFunctionDefinition(indent, 'GetCodec', - scope: api.name, - returnType: 'const flutter::StandardMessageCodec&', body: () { - indent.writeln( - 'return flutter::StandardMessageCodec::GetInstance(&$codeSerializerName::GetInstance());'); - }); + _writeFunctionDefinition( + indent, + 'GetCodec', + scope: api.name, + returnType: 'const flutter::StandardMessageCodec&', + body: () { + indent.writeln( + 'return flutter::StandardMessageCodec::GetInstance(&$codeSerializerName::GetInstance());'); + }, + ); for (final Method func in api.methods) { final HostDatatype returnType = getHostDatatype(func.returnType, _shortBaseCppTypeForBuiltinDartType); @@ -908,7 +947,7 @@ class CppSourceGenerator extends StructuredGenerator { returnType: _voidType, parameters: parameters, body: () { indent.writeln( - 'const std::string channel_name = "${makeChannelName(api, func, dartPackageName)}";'); + 'const std::string channel_name = "${makeChannelName(api, func, dartPackageName)}" + message_channel_suffix_;'); indent.writeln('BasicMessageChannel<> channel(binary_messenger_, ' 'channel_name, &GetCodec());'); @@ -995,19 +1034,35 @@ class CppSourceGenerator extends StructuredGenerator { }); indent.writeln( '$_commentPrefix Sets up an instance of `${api.name}` to handle messages through the `binary_messenger`.'); + _writeFunctionDefinition( + indent, + 'SetUp', + scope: api.name, + returnType: _voidType, + parameters: [ + 'flutter::BinaryMessenger* binary_messenger', + '${api.name}* api', + ], + body: () { + indent.writeln('${api.name}::SetUp(binary_messenger, api, "");'); + }, + ); _writeFunctionDefinition(indent, 'SetUp', scope: api.name, returnType: _voidType, parameters: [ 'flutter::BinaryMessenger* binary_messenger', - '${api.name}* api' + '${api.name}* api', + 'const std::string& message_channel_suffix', ], body: () { + indent.writeln( + 'const std::string prepended_suffix = message_channel_suffix.length() > 0 ? std::string(".") + message_channel_suffix : "";'); for (final Method method in api.methods) { final String channelName = makeChannelName(api, method, dartPackageName); indent.writeScoped('{', '}', () { indent.writeln('BasicMessageChannel<> channel(binary_messenger, ' - '"$channelName", &GetCodec());'); + '"$channelName" + prepended_suffix, &GetCodec());'); indent.writeScoped('if (api != nullptr) {', '} else {', () { indent.write( 'channel.SetMessageHandler([api](const EncodableValue& message, const flutter::MessageReply& reply) '); diff --git a/packages/pigeon/lib/dart_generator.dart b/packages/pigeon/lib/dart_generator.dart index 40ce7a6e5df4..adc0aef5cc96 100644 --- a/packages/pigeon/lib/dart_generator.dart +++ b/packages/pigeon/lib/dart_generator.dart @@ -21,6 +21,9 @@ const String _docCommentPrefix = '///'; /// user defined parameters. const String _varNamePrefix = '__pigeon_'; +/// Name of the variable that contains the message channel suffix for APIs. +const String _suffixVarName = '${_varNamePrefix}messageChannelSuffix'; + /// Name of the `InstanceManager` variable for a ProxyApi class; const String _instanceManagerVarName = '${classMemberNamePrefix}instanceManager'; @@ -319,7 +322,7 @@ $resultAt != null /// abstract class Foo { /// static const MessageCodec codec = FooCodec(); /// int add(int x, int y); - /// static void setup(Foo api, {BinaryMessenger? binaryMessenger}) {...} + /// static void setUp(Foo api, {BinaryMessenger? binaryMessenger}) {...} /// } @override void writeFlutterApi( @@ -363,8 +366,11 @@ $resultAt != null indent.newln(); } indent.write( - 'static void setup(${api.name}? api, {BinaryMessenger? binaryMessenger}) '); + "static void setUp(${api.name}? api, {BinaryMessenger? binaryMessenger, String messageChannelSuffix = '',}) "); indent.addScoped('{', '}', () { + indent.writeln( + r"messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';"); + for (final Method func in api.methods) { _writeFlutterMethodMessageHandler( indent, @@ -422,14 +428,17 @@ $resultAt != null /// Constructor for [${api.name}]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. -${api.name}({BinaryMessenger? binaryMessenger}) -\t\t: ${_varNamePrefix}binaryMessenger = binaryMessenger; +${api.name}({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : ${_varNamePrefix}binaryMessenger = binaryMessenger, + ${_varNamePrefix}messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.\$messageChannelSuffix' : ''; final BinaryMessenger? ${_varNamePrefix}binaryMessenger; '''); indent.writeln( 'static const MessageCodec $_pigeonChannelCodec = $codecName();'); indent.newln(); + indent.writeln('final String $_suffixVarName;'); + indent.newln(); for (final Method func in api.methods) { if (!first) { indent.newln(); @@ -443,6 +452,7 @@ final BinaryMessenger? ${_varNamePrefix}binaryMessenger; returnType: func.returnType, documentationComments: func.documentationComments, channelName: makeChannelName(api, func, dartPackageName), + addSuffixVariable: true, ); } }); @@ -742,12 +752,10 @@ PlatformException _createConnectionError(String channelName) { required TypeDeclaration returnType, required List documentationComments, required String channelName, + required bool addSuffixVariable, }) { addDocumentationComments(indent, documentationComments, _docCommentSpec); - String argSignature = ''; - if (parameters.isNotEmpty) { - argSignature = _getMethodParameterSignature(parameters); - } + final String argSignature = _getMethodParameterSignature(parameters); indent.write( 'Future<${_addGenericTypesNullable(returnType)}> $name($argSignature) async ', ); @@ -757,6 +765,7 @@ PlatformException _createConnectionError(String channelName) { channelName: channelName, parameters: parameters, returnType: returnType, + addSuffixVariable: addSuffixVariable, ); }); } @@ -766,6 +775,7 @@ PlatformException _createConnectionError(String channelName) { required String channelName, required Iterable parameters, required TypeDeclaration returnType, + required bool addSuffixVariable, }) { String sendArgument = 'null'; if (parameters.isNotEmpty) { @@ -780,9 +790,10 @@ PlatformException _createConnectionError(String channelName) { }); sendArgument = '[${argExpressions.join(', ')}]'; } - - indent - .writeln("const String ${_varNamePrefix}channelName = '$channelName';"); + final String channelSuffix = addSuffixVariable ? '\$$_suffixVarName' : ''; + final String constOrFinal = addSuffixVariable ? 'final' : 'const'; + indent.writeln( + "$constOrFinal String ${_varNamePrefix}channelName = '$channelName$channelSuffix';"); indent.writeScoped( 'final BasicMessageChannel ${_varNamePrefix}channel = BasicMessageChannel(', ');', () { @@ -850,6 +861,7 @@ if (${_varNamePrefix}replyList == null) { required String channelName, required bool isMockHandler, required bool isAsynchronous, + bool addSuffixVariable = false, String nullHandlerExpression = 'api == null', String Function(String methodName, Iterable parameters, Iterable safeArgumentNames) @@ -861,7 +873,9 @@ if (${_varNamePrefix}replyList == null) { 'final BasicMessageChannel ${_varNamePrefix}channel = BasicMessageChannel(', ); indent.nest(2, () { - indent.writeln("'$channelName', $_pigeonChannelCodec,"); + final String channelSuffix = + addSuffixVariable ? '' : r'$messageChannelSuffix'; + indent.writeln("'$channelName$channelSuffix', $_pigeonChannelCodec,"); indent.writeln( 'binaryMessenger: binaryMessenger);', ); @@ -1061,6 +1075,7 @@ if (${_varNamePrefix}replyList == null) { final StringBuffer messageCallSink = StringBuffer(); _writeHostMethodMessageCall( Indent(messageCallSink), + addSuffixVariable: false, channelName: channelName, parameters: [ Parameter( @@ -1451,6 +1466,7 @@ if (${_varNamePrefix}replyList == null) { _writeFlutterMethodMessageHandler( Indent(messageHandlerSink), name: methodName, + addSuffixVariable: true, parameters: [ Parameter( name: '${classMemberNamePrefix}instanceIdentifier', @@ -1506,6 +1522,7 @@ if (${_varNamePrefix}replyList == null) { _writeFlutterMethodMessageHandler( Indent(messageHandlerSink), name: method.name, + addSuffixVariable: true, parameters: [ Parameter( name: '${classMemberNamePrefix}instance', @@ -1576,6 +1593,7 @@ if (${_varNamePrefix}replyList == null) { final StringBuffer messageCallSink = StringBuffer(); _writeHostMethodMessageCall( Indent(messageCallSink), + addSuffixVariable: false, channelName: makeChannelNameWithStrings( apiName: apiName, methodName: field.name, @@ -1697,6 +1715,7 @@ if (${_varNamePrefix}replyList == null) { final StringBuffer messageCallSink = StringBuffer(); _writeHostMethodMessageCall( Indent(messageCallSink), + addSuffixVariable: false, channelName: makeChannelNameWithStrings( apiName: apiName, methodName: method.name, diff --git a/packages/pigeon/lib/generator_tools.dart b/packages/pigeon/lib/generator_tools.dart index 4540b5d04d8e..76c9abf18865 100644 --- a/packages/pigeon/lib/generator_tools.dart +++ b/packages/pigeon/lib/generator_tools.dart @@ -13,7 +13,7 @@ import 'ast.dart'; /// The current version of pigeon. /// /// This must match the version in pubspec.yaml. -const String pigeonVersion = '17.3.0'; +const String pigeonVersion = '18.0.0'; /// Read all the content from [stdin] to a String. String readStdin() { diff --git a/packages/pigeon/lib/java_generator.dart b/packages/pigeon/lib/java_generator.dart index 0758071e9435..5e8fbb2c045c 100644 --- a/packages/pigeon/lib/java_generator.dart +++ b/packages/pigeon/lib/java_generator.dart @@ -426,11 +426,19 @@ class JavaGenerator extends StructuredGenerator { indent.write('public static class ${api.name} '); indent.addScoped('{', '}', () { indent.writeln('private final @NonNull BinaryMessenger binaryMessenger;'); + indent.writeln('private final String messageChannelSuffix;'); indent.newln(); indent.write( 'public ${api.name}(@NonNull BinaryMessenger argBinaryMessenger) '); + indent.addScoped('{', '}', () { + indent.writeln('this(argBinaryMessenger, "");'); + }); + indent.write( + 'public ${api.name}(@NonNull BinaryMessenger argBinaryMessenger, @NonNull String messageChannelSuffix) '); indent.addScoped('{', '}', () { indent.writeln('this.binaryMessenger = argBinaryMessenger;'); + indent.writeln( + 'this.messageChannelSuffix = messageChannelSuffix.isEmpty() ? "" : "." + messageChannelSuffix;'); }); indent.newln(); indent.writeln('/** Public interface for sending reply. */ '); @@ -481,7 +489,7 @@ class JavaGenerator extends StructuredGenerator { indent.addScoped('{', '}', () { const String channel = 'channel'; indent.writeln( - 'final String channelName = "${makeChannelName(api, func, dartPackageName)}";'); + 'final String channelName = "${makeChannelName(api, func, dartPackageName)}" + messageChannelSuffix;'); indent.writeln('BasicMessageChannel $channel ='); indent.nest(2, () { indent.writeln('new BasicMessageChannel<>('); @@ -608,9 +616,16 @@ class JavaGenerator extends StructuredGenerator { indent.writeln( '${_docCommentPrefix}Sets up an instance of `${api.name}` to handle messages through the `binaryMessenger`.$_docCommentSuffix'); + indent.writeScoped( + 'static void setUp(@NonNull BinaryMessenger binaryMessenger, @Nullable ${api.name} api) {', + '}', () { + indent.writeln('setUp(binaryMessenger, "", api);'); + }); indent.write( - 'static void setUp(@NonNull BinaryMessenger binaryMessenger, @Nullable ${api.name} api) '); + 'static void setUp(@NonNull BinaryMessenger binaryMessenger, @NonNull String messageChannelSuffix, @Nullable ${api.name} api) '); indent.addScoped('{', '}', () { + indent.writeln( + 'messageChannelSuffix = messageChannelSuffix.isEmpty() ? "" : "." + messageChannelSuffix;'); for (final Method method in api.methods) { _writeMethodSetUp( generatorOptions, @@ -687,7 +702,8 @@ class JavaGenerator extends StructuredGenerator { indent.nest(2, () { indent.writeln('new BasicMessageChannel<>('); indent.nest(2, () { - indent.write('binaryMessenger, "$channelName", getCodec()'); + indent.write( + 'binaryMessenger, "$channelName" + messageChannelSuffix, getCodec()'); if (taskQueue != null) { indent.addln(', $taskQueue);'); } else { diff --git a/packages/pigeon/lib/kotlin_generator.dart b/packages/pigeon/lib/kotlin_generator.dart index 39697fa3242d..c81df1295ed1 100644 --- a/packages/pigeon/lib/kotlin_generator.dart +++ b/packages/pigeon/lib/kotlin_generator.dart @@ -354,8 +354,8 @@ class KotlinGenerator extends StructuredGenerator { final String apiName = api.name; indent.writeln('@Suppress("UNCHECKED_CAST")'); - indent - .write('class $apiName(private val binaryMessenger: BinaryMessenger) '); + indent.write( + 'class $apiName(private val binaryMessenger: BinaryMessenger, private val messageChannelSuffix: String = "") '); indent.addScoped('{', '}', () { indent.write('companion object '); indent.addScoped('{', '}', () { @@ -444,8 +444,10 @@ class KotlinGenerator extends StructuredGenerator { '/** Sets up an instance of `$apiName` to handle messages through the `binaryMessenger`. */'); indent.writeln('@Suppress("UNCHECKED_CAST")'); indent.write( - 'fun setUp(binaryMessenger: BinaryMessenger, api: $apiName?) '); + 'fun setUp(binaryMessenger: BinaryMessenger, api: $apiName?, messageChannelSuffix: String = "") '); indent.addScoped('{', '}', () { + indent.writeln( + r'val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""'); for (final Method method in api.methods) { _writeHostMethodMessageHandler( indent, @@ -675,9 +677,8 @@ class KotlinGenerator extends StructuredGenerator { indent.writeln( 'val $taskQueue = binaryMessenger.makeBackgroundTaskQueue()'); } - indent.write( - 'val channel = BasicMessageChannel(binaryMessenger, "$channelName", codec'); + 'val channel = BasicMessageChannel(binaryMessenger, "$channelName\$separatedMessageChannelSuffix", codec'); if (taskQueue != null) { indent.addln(', $taskQueue)'); @@ -769,13 +770,6 @@ class KotlinGenerator extends StructuredGenerator { required String dartPackageName, List documentationComments = const [], int? minApiRequirement, - void Function( - Indent indent, { - required List parameters, - required TypeDeclaration returnType, - required String channelName, - required String errorClassName, - }) onWriteBody = _writeFlutterMethodMessageCall, }) { _writeMethodDeclaration( indent, @@ -790,7 +784,7 @@ class KotlinGenerator extends StructuredGenerator { final String errorClassName = _getErrorClassName(generatorOptions); indent.addScoped('{', '}', () { - onWriteBody( + _writeFlutterMethodMessageCall( indent, parameters: parameters, returnType: returnType, @@ -820,7 +814,10 @@ class KotlinGenerator extends StructuredGenerator { } const String channel = 'channel'; - indent.writeln('val channelName = "$channelName"'); + indent.writeln( + r'val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""'); + indent.writeln( + 'val channelName = "$channelName\$separatedMessageChannelSuffix"'); indent.writeln( 'val $channel = BasicMessageChannel(binaryMessenger, channelName, codec)'); indent.writeScoped('$channel.send($sendArgument) {', '}', () { diff --git a/packages/pigeon/lib/objc_generator.dart b/packages/pigeon/lib/objc_generator.dart index 67c93a74f3a9..c40869a9b249 100644 --- a/packages/pigeon/lib/objc_generator.dart +++ b/packages/pigeon/lib/objc_generator.dart @@ -305,6 +305,8 @@ class ObjcHeaderGenerator extends StructuredGenerator { indent.writeln('@interface $apiName : NSObject'); indent.writeln( '- (instancetype)initWithBinaryMessenger:(id)binaryMessenger;'); + indent.writeln( + '- (instancetype)initWithBinaryMessenger:(id)binaryMessenger messageChannelSuffix:(nullable NSString *)messageChannelSuffix;'); for (final Method func in api.methods) { final _ObjcType returnType = _objcTypeForDartType( generatorOptions.prefix, func.returnType, @@ -411,6 +413,9 @@ class ObjcHeaderGenerator extends StructuredGenerator { indent.writeln( 'extern void SetUp$apiName(id binaryMessenger, NSObject<$apiName> *_Nullable api);'); indent.newln(); + indent.writeln( + 'extern void SetUp${apiName}WithSuffix(id binaryMessenger, NSObject<$apiName> *_Nullable api, NSString *messageChannelSuffix);'); + indent.newln(); } } @@ -628,7 +633,7 @@ class ObjcSourceGenerator extends StructuredGenerator { indent.newln(); indent.writeln('@implementation $apiName'); indent.newln(); - _writeInitializer(indent); + _writeInitializers(indent); for (final Method func in api.methods) { _writeMethod( generatorOptions, @@ -659,6 +664,14 @@ class ObjcSourceGenerator extends StructuredGenerator { indent.write( 'void SetUp$apiName(id binaryMessenger, NSObject<$apiName> *api) '); indent.addScoped('{', '}', () { + indent.writeln('SetUp${apiName}WithSuffix(binaryMessenger, api, @"");'); + }); + indent.newln(); + indent.write( + 'void SetUp${apiName}WithSuffix(id binaryMessenger, NSObject<$apiName> *api, NSString *messageChannelSuffix) '); + indent.addScoped('{', '}', () { + indent.writeln( + 'messageChannelSuffix = messageChannelSuffix.length > 0 ? [NSString stringWithFormat: @".%@", messageChannelSuffix] : @"";'); for (final Method func in api.methods) { addDocumentationComments( indent, func.documentationComments, _docCommentSpec); @@ -895,7 +908,7 @@ static FlutterError *createConnectionError(NSString *channelName) { indent.writeln('[[FlutterBasicMessageChannel alloc]'); indent.nest(1, () { indent.writeln( - 'initWithName:@"${makeChannelName(api, func, dartPackageName)}"'); + 'initWithName:[NSString stringWithFormat:@"%@%@", @"${makeChannelName(api, func, dartPackageName)}", messageChannelSuffix]'); indent.writeln('binaryMessenger:binaryMessenger'); indent.write('codec:'); indent @@ -1107,7 +1120,7 @@ static FlutterError *createConnectionError(NSString *channelName) { )); indent.addScoped(' {', '}', () { indent.writeln( - 'NSString *channelName = @"${makeChannelName(api, func, dartPackageName)}";'); + 'NSString *channelName = [NSString stringWithFormat:@"%@%@", @"${makeChannelName(api, func, dartPackageName)}", _messageChannelSuffix];'); indent.writeln('FlutterBasicMessageChannel *channel ='); indent.nest(1, () { indent.writeln('[FlutterBasicMessageChannel'); @@ -1526,17 +1539,27 @@ void _writeExtension(Indent indent, String apiName) { indent.writeln('@interface $apiName ()'); indent.writeln( '@property(nonatomic, strong) NSObject *binaryMessenger;'); + indent + .writeln('@property(nonatomic, strong) NSString *messageChannelSuffix;'); indent.writeln('@end'); } -void _writeInitializer(Indent indent) { +void _writeInitializers(Indent indent) { indent.write( '- (instancetype)initWithBinaryMessenger:(NSObject *)binaryMessenger '); indent.addScoped('{', '}', () { - indent.writeln('self = [super init];'); + indent.writeln( + 'return [self initWithBinaryMessenger:binaryMessenger messageChannelSuffix:@""];'); + }); + indent.write( + '- (instancetype)initWithBinaryMessenger:(NSObject *)binaryMessenger messageChannelSuffix:(nullable NSString*)messageChannelSuffix'); + indent.addScoped('{', '}', () { + indent.writeln('self = [self init];'); indent.write('if (self) '); indent.addScoped('{', '}', () { indent.writeln('_binaryMessenger = binaryMessenger;'); + indent.writeln( + '_messageChannelSuffix = [messageChannelSuffix length] == 0 ? @"" : [NSString stringWithFormat: @".%@", messageChannelSuffix];'); }); indent.writeln('return self;'); }); diff --git a/packages/pigeon/lib/swift_generator.dart b/packages/pigeon/lib/swift_generator.dart index 791cdd2e9365..854c2c835f2f 100644 --- a/packages/pigeon/lib/swift_generator.dart +++ b/packages/pigeon/lib/swift_generator.dart @@ -327,9 +327,13 @@ class SwiftGenerator extends StructuredGenerator { indent.write('class ${api.name}: ${api.name}Protocol '); indent.addScoped('{', '}', () { indent.writeln('private let binaryMessenger: FlutterBinaryMessenger'); - indent.write('init(binaryMessenger: FlutterBinaryMessenger) '); + indent.writeln('private let messageChannelSuffix: String'); + indent.write( + 'init(binaryMessenger: FlutterBinaryMessenger, messageChannelSuffix: String = "") '); indent.addScoped('{', '}', () { indent.writeln('self.binaryMessenger = binaryMessenger'); + indent.writeln( + r'self.messageChannelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : ""'); }); final String codecName = _getCodecName(api); String codecArgumentString = ''; @@ -414,8 +418,10 @@ class SwiftGenerator extends StructuredGenerator { indent.writeln( '$_docCommentPrefix Sets up an instance of `$apiName` to handle messages through the `binaryMessenger`.'); indent.write( - 'static func setUp(binaryMessenger: FlutterBinaryMessenger, api: $apiName?) '); + 'static func setUp(binaryMessenger: FlutterBinaryMessenger, api: $apiName?, messageChannelSuffix: String = "") '); indent.addScoped('{', '}', () { + indent.writeln( + r'let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : ""'); for (final Method method in api.methods) { _writeHostMethodMessageHandler( indent, @@ -736,7 +742,8 @@ private func nilOrValue(_ value: Any?) -> T? { ? 'nil' : '[${enumSafeArgNames.join(', ')}] as [Any?]'; const String channel = 'channel'; - indent.writeln('let channelName: String = "$channelName"'); + indent.writeln( + 'let channelName: String = "$channelName\\(messageChannelSuffix)"'); indent.writeln( 'let $channel = FlutterBasicMessageChannel(name: channelName, binaryMessenger: binaryMessenger$codecArgumentString)'); indent.write('$channel.sendMessage($sendArgument) '); @@ -766,7 +773,6 @@ private func nilOrValue(_ value: Any?) -> T? { indent.writeln('completion(.success(Void()))'); } else { final String fieldType = _swiftTypeForDartType(returnType); - _writeGenericCasting( indent: indent, value: 'listResponse[0]', @@ -774,7 +780,6 @@ private func nilOrValue(_ value: Any?) -> T? { fieldType: fieldType, type: returnType, ); - indent.writeln('completion(.success(result))'); } }); @@ -802,9 +807,8 @@ private func nilOrValue(_ value: Any?) -> T? { final String varChannelName = '${name}Channel'; addDocumentationComments(indent, documentationComments, _docCommentSpec); - indent.writeln( - 'let $varChannelName = FlutterBasicMessageChannel(name: "$channelName", binaryMessenger: binaryMessenger$codecArgumentString)'); + 'let $varChannelName = FlutterBasicMessageChannel(name: "$channelName\\(channelSuffix)", binaryMessenger: binaryMessenger$codecArgumentString)'); indent.write('if let api = api '); indent.addScoped('{', '}', () { indent.write('$varChannelName.setMessageHandler '); diff --git a/packages/pigeon/pigeons/core_tests.dart b/packages/pigeon/pigeons/core_tests.dart index 3fbac83fff8b..3107bc55353f 100644 --- a/packages/pigeon/pigeons/core_tests.dart +++ b/packages/pigeon/pigeons/core_tests.dart @@ -600,6 +600,11 @@ abstract class HostIntegrationCoreApi { @ObjCSelector('callFlutterEchoNullableEnum:') @SwiftFunction('callFlutterNullableEcho(_:)') AnEnum? callFlutterEchoNullableEnum(AnEnum? anEnum); + + @async + @ObjCSelector('callFlutterSmallApiEchoString:') + @SwiftFunction('callFlutterSmallApiEcho(_:)') + String callFlutterSmallApiEchoString(String aString); } /// The core interface that the Dart platform_test code implements for host @@ -790,7 +795,7 @@ abstract class FlutterSmallApi { TestMessage echoWrappedList(TestMessage msg); @ObjCSelector('echoString:') - @SwiftFunction('echo(_:)') + @SwiftFunction('echo(string:)') String echoString(String aString); } diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/AlternateLanguageTestPlugin.java b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/AlternateLanguageTestPlugin.java index 7a44f6a88834..04f607922932 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/AlternateLanguageTestPlugin.java +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/AlternateLanguageTestPlugin.java @@ -12,6 +12,7 @@ import com.example.alternate_language_test_plugin.CoreTests.AllTypes; import com.example.alternate_language_test_plugin.CoreTests.AnEnum; import com.example.alternate_language_test_plugin.CoreTests.FlutterIntegrationCoreApi; +import com.example.alternate_language_test_plugin.CoreTests.FlutterSmallApi; import com.example.alternate_language_test_plugin.CoreTests.HostIntegrationCoreApi; import com.example.alternate_language_test_plugin.CoreTests.NullableResult; import com.example.alternate_language_test_plugin.CoreTests.Result; @@ -23,11 +24,19 @@ /** This plugin handles the native side of the integration tests in example/integration_test/. */ public class AlternateLanguageTestPlugin implements FlutterPlugin, HostIntegrationCoreApi { @Nullable FlutterIntegrationCoreApi flutterApi = null; + @Nullable FlutterSmallApi flutterSmallApiOne = null; + @Nullable FlutterSmallApi flutterSmallApiTwo = null; @Override public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) { HostIntegrationCoreApi.setUp(binding.getBinaryMessenger(), this); flutterApi = new FlutterIntegrationCoreApi(binding.getBinaryMessenger()); + flutterSmallApiOne = new FlutterSmallApi(binding.getBinaryMessenger(), "suffixOne"); + flutterSmallApiTwo = new FlutterSmallApi(binding.getBinaryMessenger(), "suffixTwo"); + TestPluginWithSuffix testSuffixApiOne = new TestPluginWithSuffix(); + testSuffixApiOne.setUp(binding, "suffixOne"); + TestPluginWithSuffix testSuffixApiTwo = new TestPluginWithSuffix(); + testSuffixApiTwo.setUp(binding, "suffixTwo"); } @Override @@ -508,4 +517,60 @@ public void callFlutterEchoNullableEnum( @Nullable AnEnum anEnum, @NonNull NullableResult result) { flutterApi.echoNullableEnum(anEnum, result); } + + @Override + public void callFlutterSmallApiEchoString( + @NonNull String aString, @NonNull Result result) { + final String[] resultOne = {""}; + + Result resultCallbackTwo = + new Result() { + public void success(String res) { + String resOne = resultOne[0]; + if (res.equals(resOne)) { + result.success(res); + } else { + result.error( + new CoreTests.FlutterError( + "Responses do not match", + "Multi-instance responses were not matching: " + resultOne[0] + ", " + res, + "")); + } + } + + public void error(Throwable error) { + result.error(error); + } + }; + + Result resultCallbackOne = + new Result() { + public void success(String res) { + resultOne[0] = res; + flutterSmallApiTwo.echoString(aString, resultCallbackTwo); + } + + public void error(Throwable error) { + result.error(error); + } + }; + flutterSmallApiOne.echoString(aString, resultCallbackOne); + } +} + +class TestPluginWithSuffix implements CoreTests.HostSmallApi { + + public void setUp(FlutterPlugin.FlutterPluginBinding binding, String suffix) { + CoreTests.HostSmallApi.setUp(binding.getBinaryMessenger(), suffix, this); + } + + @Override + public void echo(@NonNull String aString, @NonNull Result result) { + result.success(aString); + } + + @Override + public void voidVoid(@NonNull VoidResult result) { + result.success(); + } } diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java index 93dad3828781..1d5bde23a341 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/android/src/main/java/com/example/alternate_language_test_plugin/CoreTests.java @@ -1733,6 +1733,8 @@ void callFlutterEchoNullableMap( void callFlutterEchoNullableEnum( @Nullable AnEnum anEnum, @NonNull NullableResult result); + void callFlutterSmallApiEchoString(@NonNull String aString, @NonNull Result result); + /** The codec used by HostIntegrationCoreApi. */ static @NonNull MessageCodec getCodec() { return HostIntegrationCoreApiCodec.INSTANCE; @@ -1743,11 +1745,20 @@ void callFlutterEchoNullableEnum( */ static void setUp( @NonNull BinaryMessenger binaryMessenger, @Nullable HostIntegrationCoreApi api) { + setUp(binaryMessenger, "", api); + } + + static void setUp( + @NonNull BinaryMessenger binaryMessenger, + @NonNull String messageChannelSuffix, + @Nullable HostIntegrationCoreApi api) { + messageChannelSuffix = messageChannelSuffix.isEmpty() ? "" : "." + messageChannelSuffix; { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -1770,7 +1781,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -1795,7 +1807,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -1818,7 +1831,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwErrorFromVoid", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwErrorFromVoid" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -1841,7 +1855,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwFlutterError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwFlutterError" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -1864,7 +1879,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -1889,7 +1905,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -1914,7 +1931,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -1939,7 +1957,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -1964,7 +1983,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -1989,7 +2009,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2014,7 +2035,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2039,7 +2061,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2064,7 +2087,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassWrapper", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassWrapper" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2089,7 +2113,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoEnum", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoEnum" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2114,7 +2139,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedDefaultString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedDefaultString" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2139,7 +2165,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalDefaultDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalDefaultDouble" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2164,7 +2191,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoRequiredInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoRequiredInt" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2190,7 +2218,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypes" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2215,7 +2244,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypesWithoutRecursion" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2242,7 +2272,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.extractNestedNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.extractNestedNullableString" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2267,7 +2298,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.createNestedNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.createNestedNullableString" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2292,7 +2324,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypes" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2323,7 +2356,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2354,7 +2388,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2381,7 +2416,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableDouble" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2406,7 +2442,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableBool" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2431,7 +2468,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableString" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2456,7 +2494,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableUint8List" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2481,7 +2520,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableObject", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableObject" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2506,7 +2546,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableList" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2531,7 +2572,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2556,7 +2598,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnum", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnum" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2581,7 +2624,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalNullableInt" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2608,7 +2652,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedNullableString" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2633,7 +2678,8 @@ static void setUp( BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2662,7 +2708,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2693,7 +2740,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2724,7 +2772,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2755,7 +2804,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2786,7 +2836,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncUint8List" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2817,7 +2868,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2848,7 +2900,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2879,7 +2932,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2910,7 +2964,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncEnum", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncEnum" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2941,7 +2996,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2970,7 +3026,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncErrorFromVoid", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncErrorFromVoid" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -2999,7 +3056,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncFlutterError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncFlutterError" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3028,7 +3086,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncAllTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncAllTypes" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3059,7 +3118,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3090,7 +3150,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypesWithoutRecursion" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3123,7 +3184,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableInt" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3155,7 +3217,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableDouble" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3186,7 +3249,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableBool" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3217,7 +3281,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableString" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3248,7 +3313,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableUint8List" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3279,7 +3345,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableObject", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableObject" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3310,7 +3377,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableList" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3341,7 +3409,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableMap" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3372,7 +3441,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableEnum", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableEnum" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3403,7 +3473,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3432,7 +3503,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowError" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3461,7 +3533,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3490,7 +3563,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllTypes" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3521,7 +3595,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypes" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3552,7 +3627,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3589,7 +3665,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypesWithoutRecursion" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3621,7 +3698,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypesWithoutRecursion" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3658,7 +3736,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoBool" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3689,7 +3768,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoInt" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3721,7 +3801,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoDouble" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3752,7 +3833,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoString" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3783,7 +3865,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoUint8List" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3814,7 +3897,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoList" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3845,7 +3929,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3876,7 +3961,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnum", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnum" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3907,7 +3993,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3938,7 +4025,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -3970,7 +4058,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -4001,7 +4090,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -4032,7 +4122,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -4063,7 +4154,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -4094,7 +4186,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -4125,7 +4218,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnum", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnum" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -4152,6 +4246,38 @@ public void error(Throwable error) { channel.setMessageHandler(null); } } + { + BasicMessageChannel channel = + new BasicMessageChannel<>( + binaryMessenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSmallApiEchoString" + + messageChannelSuffix, + getCodec()); + if (api != null) { + channel.setMessageHandler( + (message, reply) -> { + ArrayList wrapped = new ArrayList(); + ArrayList args = (ArrayList) message; + String aStringArg = (String) args.get(0); + Result resultCallback = + new Result() { + public void success(String result) { + wrapped.add(0, result); + reply.reply(wrapped); + } + + public void error(Throwable error) { + ArrayList wrappedError = wrapError(error); + reply.reply(wrappedError); + } + }; + + api.callFlutterSmallApiEchoString(aStringArg, resultCallback); + }); + } else { + channel.setMessageHandler(null); + } + } } } @@ -4210,9 +4336,16 @@ protected void writeValue(@NonNull ByteArrayOutputStream stream, Object value) { */ public static class FlutterIntegrationCoreApi { private final @NonNull BinaryMessenger binaryMessenger; + private final String messageChannelSuffix; public FlutterIntegrationCoreApi(@NonNull BinaryMessenger argBinaryMessenger) { + this(argBinaryMessenger, ""); + } + + public FlutterIntegrationCoreApi( + @NonNull BinaryMessenger argBinaryMessenger, @NonNull String messageChannelSuffix) { this.binaryMessenger = argBinaryMessenger; + this.messageChannelSuffix = messageChannelSuffix.isEmpty() ? "" : "." + messageChannelSuffix; } /** Public interface for sending reply. */ @@ -4225,7 +4358,8 @@ public FlutterIntegrationCoreApi(@NonNull BinaryMessenger argBinaryMessenger) { */ public void noop(@NonNull VoidResult result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4250,7 +4384,8 @@ public void noop(@NonNull VoidResult result) { /** Responds with an error from an async function returning a value. */ public void throwError(@NonNull NullableResult result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4277,7 +4412,8 @@ public void throwError(@NonNull NullableResult result) { /** Responds with an error from an async void function. */ public void throwErrorFromVoid(@NonNull VoidResult result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwErrorFromVoid"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwErrorFromVoid" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4302,7 +4438,8 @@ public void throwErrorFromVoid(@NonNull VoidResult result) { /** Returns the passed object, to test serialization and deserialization. */ public void echoAllTypes(@NonNull AllTypes everythingArg, @NonNull Result result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4337,7 +4474,8 @@ public void echoAllNullableTypes( @Nullable AllNullableTypes everythingArg, @NonNull NullableResult result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4372,7 +4510,8 @@ public void sendMultipleNullableTypes( @Nullable String aNullableStringArg, @NonNull Result result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4408,7 +4547,8 @@ public void echoAllNullableTypesWithoutRecursion( @Nullable AllNullableTypesWithoutRecursion everythingArg, @NonNull NullableResult result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypesWithoutRecursion"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypesWithoutRecursion" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4444,7 +4584,8 @@ public void sendMultipleNullableTypesWithoutRecursion( @Nullable String aNullableStringArg, @NonNull Result result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4479,7 +4620,8 @@ public void sendMultipleNullableTypesWithoutRecursion( /** Returns the passed boolean, to test serialization and deserialization. */ public void echoBool(@NonNull Boolean aBoolArg, @NonNull Result result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4512,7 +4654,8 @@ public void echoBool(@NonNull Boolean aBoolArg, @NonNull Result result) /** Returns the passed int, to test serialization and deserialization. */ public void echoInt(@NonNull Long anIntArg, @NonNull Result result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4546,7 +4689,8 @@ public void echoInt(@NonNull Long anIntArg, @NonNull Result result) { /** Returns the passed double, to test serialization and deserialization. */ public void echoDouble(@NonNull Double aDoubleArg, @NonNull Result result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4579,7 +4723,8 @@ public void echoDouble(@NonNull Double aDoubleArg, @NonNull Result resul /** Returns the passed string, to test serialization and deserialization. */ public void echoString(@NonNull String aStringArg, @NonNull Result result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4612,7 +4757,8 @@ public void echoString(@NonNull String aStringArg, @NonNull Result resul /** Returns the passed byte list, to test serialization and deserialization. */ public void echoUint8List(@NonNull byte[] aListArg, @NonNull Result result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4645,7 +4791,8 @@ public void echoUint8List(@NonNull byte[] aListArg, @NonNull Result resu /** Returns the passed list, to test serialization and deserialization. */ public void echoList(@NonNull List aListArg, @NonNull Result> result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4679,7 +4826,8 @@ public void echoList(@NonNull List aListArg, @NonNull Result aMapArg, @NonNull Result> result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4712,7 +4860,8 @@ public void echoMap( /** Returns the passed enum to test serialization and deserialization. */ public void echoEnum(@NonNull AnEnum anEnumArg, @NonNull Result result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnum"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnum" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4746,7 +4895,8 @@ public void echoEnum(@NonNull AnEnum anEnumArg, @NonNull Result result) public void echoNullableBool( @Nullable Boolean aBoolArg, @NonNull NullableResult result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4773,7 +4923,8 @@ public void echoNullableBool( /** Returns the passed int, to test serialization and deserialization. */ public void echoNullableInt(@Nullable Long anIntArg, @NonNull NullableResult result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4802,7 +4953,8 @@ public void echoNullableInt(@Nullable Long anIntArg, @NonNull NullableResult result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4830,7 +4982,8 @@ public void echoNullableDouble( public void echoNullableString( @Nullable String aStringArg, @NonNull NullableResult result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4858,7 +5011,8 @@ public void echoNullableString( public void echoNullableUint8List( @Nullable byte[] aListArg, @NonNull NullableResult result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableUint8List"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableUint8List" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4886,7 +5040,8 @@ public void echoNullableUint8List( public void echoNullableList( @Nullable List aListArg, @NonNull NullableResult> result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4915,7 +5070,8 @@ public void echoNullableMap( @Nullable Map aMapArg, @NonNull NullableResult> result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4943,7 +5099,8 @@ public void echoNullableMap( public void echoNullableEnum( @Nullable AnEnum anEnumArg, @NonNull NullableResult result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnum"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnum" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -4975,7 +5132,8 @@ public void echoNullableEnum( */ public void noopAsync(@NonNull VoidResult result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -5000,7 +5158,8 @@ public void noopAsync(@NonNull VoidResult result) { /** Returns the passed in generic Object asynchronously. */ public void echoAsyncString(@NonNull String aStringArg, @NonNull Result result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -5046,11 +5205,20 @@ public interface HostTrivialApi { } /** Sets up an instance of `HostTrivialApi` to handle messages through the `binaryMessenger`. */ static void setUp(@NonNull BinaryMessenger binaryMessenger, @Nullable HostTrivialApi api) { + setUp(binaryMessenger, "", api); + } + + static void setUp( + @NonNull BinaryMessenger binaryMessenger, + @NonNull String messageChannelSuffix, + @Nullable HostTrivialApi api) { + messageChannelSuffix = messageChannelSuffix.isEmpty() ? "" : "." + messageChannelSuffix; { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop", + "dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -5088,11 +5256,20 @@ public interface HostSmallApi { } /** Sets up an instance of `HostSmallApi` to handle messages through the `binaryMessenger`. */ static void setUp(@NonNull BinaryMessenger binaryMessenger, @Nullable HostSmallApi api) { + setUp(binaryMessenger, "", api); + } + + static void setUp( + @NonNull BinaryMessenger binaryMessenger, + @NonNull String messageChannelSuffix, + @Nullable HostSmallApi api) { + messageChannelSuffix = messageChannelSuffix.isEmpty() ? "" : "." + messageChannelSuffix; { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo", + "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -5123,7 +5300,8 @@ public void error(Throwable error) { BasicMessageChannel channel = new BasicMessageChannel<>( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid", + "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid" + + messageChannelSuffix, getCodec()); if (api != null) { channel.setMessageHandler( @@ -5184,9 +5362,16 @@ protected void writeValue(@NonNull ByteArrayOutputStream stream, Object value) { */ public static class FlutterSmallApi { private final @NonNull BinaryMessenger binaryMessenger; + private final String messageChannelSuffix; public FlutterSmallApi(@NonNull BinaryMessenger argBinaryMessenger) { + this(argBinaryMessenger, ""); + } + + public FlutterSmallApi( + @NonNull BinaryMessenger argBinaryMessenger, @NonNull String messageChannelSuffix) { this.binaryMessenger = argBinaryMessenger; + this.messageChannelSuffix = messageChannelSuffix.isEmpty() ? "" : "." + messageChannelSuffix; } /** Public interface for sending reply. */ @@ -5197,7 +5382,8 @@ public FlutterSmallApi(@NonNull BinaryMessenger argBinaryMessenger) { public void echoWrappedList(@NonNull TestMessage msgArg, @NonNull Result result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( @@ -5230,7 +5416,8 @@ public void echoWrappedList(@NonNull TestMessage msgArg, @NonNull Result result) { final String channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString" + + messageChannelSuffix; BasicMessageChannel channel = new BasicMessageChannel<>(binaryMessenger, channelName, getCodec()); channel.send( diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/AlternateLanguageTestPlugin.h b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/AlternateLanguageTestPlugin.h index afb911d8e00d..de949488ae51 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/AlternateLanguageTestPlugin.h +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/AlternateLanguageTestPlugin.h @@ -8,3 +8,8 @@ @interface AlternateLanguageTestPlugin : NSObject @end + +@interface AlternateLanguageTestAPIWithSuffix : NSObject ++ (void)registerWithRegistrar:(NSObject *)registrar + suffix:(NSString *)suffix; +@end diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/AlternateLanguageTestPlugin.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/AlternateLanguageTestPlugin.m index c3501d5ce7ae..e3f26dcb8d75 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/AlternateLanguageTestPlugin.m +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/AlternateLanguageTestPlugin.m @@ -7,6 +7,8 @@ #import "CoreTests.gen.h" @interface AlternateLanguageTestPlugin () +@property(nonatomic) FLTFlutterSmallApi *flutterSmallApiOne; +@property(nonatomic) FLTFlutterSmallApi *flutterSmallApiTwo; @property(nonatomic) FLTFlutterIntegrationCoreApi *flutterAPI; @end @@ -15,8 +17,16 @@ @implementation AlternateLanguageTestPlugin + (void)registerWithRegistrar:(NSObject *)registrar { AlternateLanguageTestPlugin *plugin = [[AlternateLanguageTestPlugin alloc] init]; SetUpFLTHostIntegrationCoreApi([registrar messenger], plugin); + [AlternateLanguageTestAPIWithSuffix registerWithRegistrar:registrar suffix:@"suffixOne"]; + [AlternateLanguageTestAPIWithSuffix registerWithRegistrar:registrar suffix:@"suffixTwo"]; plugin.flutterAPI = [[FLTFlutterIntegrationCoreApi alloc] initWithBinaryMessenger:[registrar messenger]]; + plugin.flutterSmallApiOne = + [[FLTFlutterSmallApi alloc] initWithBinaryMessenger:[registrar messenger] + messageChannelSuffix:@"suffixOne"]; + plugin.flutterSmallApiTwo = + [[FLTFlutterSmallApi alloc] initWithBinaryMessenger:[registrar messenger] + messageChannelSuffix:@"suffixTwo"]; } #pragma mark HostIntegrationCoreApi implementation @@ -570,4 +580,53 @@ - (void)callFlutterEchoNullableEnum:(nullable FLTAnEnumBox *)AnEnumBoxed }]; } +- (void)callFlutterSmallApiEchoString:(nonnull NSString *)aString + completion:(nonnull void (^)(NSString *_Nullable, + FlutterError *_Nullable))completion { + [self.flutterSmallApiOne + echoString:aString + completion:^(NSString *valueOne, FlutterError *error) { + [self.flutterSmallApiTwo + echoString:aString + completion:^(NSString *valueTwo, FlutterError *error) { + if ([valueOne isEqualToString:valueTwo]) { + completion(valueTwo, error); + } else { + completion( + nil, + [FlutterError + errorWithCode:@"Responses do not match" + message:[NSString stringWithFormat: + @"%@%@%@%@", + @"Multi-instance responses were not matching: ", + valueOne, @", ", valueTwo] + details:nil]); + } + }]; + }]; +} + +@end + +@interface AlternateLanguageTestAPIWithSuffix () +@end + +@implementation AlternateLanguageTestAPIWithSuffix ++ (void)registerWithRegistrar:(NSObject *)registrar + suffix:(NSString *)suffix { + AlternateLanguageTestAPIWithSuffix *api = [[AlternateLanguageTestAPIWithSuffix alloc] init]; + SetUpFLTHostSmallApiWithSuffix([registrar messenger], api, suffix); +} + +#pragma mark HostSmallAPI implementation + +- (void)echoString:(nonnull NSString *)aString + completion:(nonnull void (^)(NSString *_Nullable, FlutterError *_Nullable))completion { + completion(aString, nil); +} + +- (void)voidVoidWithCompletion:(nonnull void (^)(FlutterError *_Nullable))completion { + completion(nil); +} + @end diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h index 72c1e9d2ec22..8e44380d7890 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.h @@ -474,11 +474,18 @@ NSObject *FLTHostIntegrationCoreApiGetCodec(void); - (void)callFlutterEchoNullableEnum:(nullable FLTAnEnumBox *)anEnumBoxed completion: (void (^)(FLTAnEnumBox *_Nullable, FlutterError *_Nullable))completion; +- (void)callFlutterSmallApiEchoString:(NSString *)aString + completion: + (void (^)(NSString *_Nullable, FlutterError *_Nullable))completion; @end extern void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, NSObject *_Nullable api); +extern void SetUpFLTHostIntegrationCoreApiWithSuffix( + id binaryMessenger, NSObject *_Nullable api, + NSString *messageChannelSuffix); + /// The codec used by FLTFlutterIntegrationCoreApi. NSObject *FLTFlutterIntegrationCoreApiGetCodec(void); @@ -486,6 +493,8 @@ NSObject *FLTFlutterIntegrationCoreApiGetCodec(void); /// integration tests to call into. @interface FLTFlutterIntegrationCoreApi : NSObject - (instancetype)initWithBinaryMessenger:(id)binaryMessenger; +- (instancetype)initWithBinaryMessenger:(id)binaryMessenger + messageChannelSuffix:(nullable NSString *)messageChannelSuffix; /// A no-op function taking no arguments and returning no value, to sanity /// test basic calling. - (void)noopWithCompletion:(void (^)(FlutterError *_Nullable))completion; @@ -594,6 +603,10 @@ NSObject *FLTHostTrivialApiGetCodec(void); extern void SetUpFLTHostTrivialApi(id binaryMessenger, NSObject *_Nullable api); +extern void SetUpFLTHostTrivialApiWithSuffix(id binaryMessenger, + NSObject *_Nullable api, + NSString *messageChannelSuffix); + /// The codec used by FLTHostSmallApi. NSObject *FLTHostSmallApiGetCodec(void); @@ -607,12 +620,18 @@ NSObject *FLTHostSmallApiGetCodec(void); extern void SetUpFLTHostSmallApi(id binaryMessenger, NSObject *_Nullable api); +extern void SetUpFLTHostSmallApiWithSuffix(id binaryMessenger, + NSObject *_Nullable api, + NSString *messageChannelSuffix); + /// The codec used by FLTFlutterSmallApi. NSObject *FLTFlutterSmallApiGetCodec(void); /// A simple API called in some unit tests. @interface FLTFlutterSmallApi : NSObject - (instancetype)initWithBinaryMessenger:(id)binaryMessenger; +- (instancetype)initWithBinaryMessenger:(id)binaryMessenger + messageChannelSuffix:(nullable NSString *)messageChannelSuffix; - (void)echoWrappedList:(FLTTestMessage *)msg completion:(void (^)(FLTTestMessage *_Nullable, FlutterError *_Nullable))completion; - (void)echoString:(NSString *)aString diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m index 2861a8880485..eecb44f2eaf8 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/ios/Classes/CoreTests.gen.m @@ -456,11 +456,23 @@ - (FlutterStandardReader *)readerWithData:(NSData *)data { void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, NSObject *api) { + SetUpFLTHostIntegrationCoreApiWithSuffix(binaryMessenger, api, @""); +} + +void SetUpFLTHostIntegrationCoreApiWithSuffix(id binaryMessenger, + NSObject *api, + NSString *messageChannelSuffix) { + messageChannelSuffix = messageChannelSuffix.length > 0 + ? [NSString stringWithFormat:@".%@", messageChannelSuffix] + : @""; /// A no-op function taking no arguments and returning no value, to sanity /// test basic calling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.noop", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -479,8 +491,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed object, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAllTypes", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -502,8 +516,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns an error, to test error handling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.throwError", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -523,8 +539,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns an error from a void function, to test error handling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"throwErrorFromVoid" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.throwErrorFromVoid", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -544,8 +562,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns a Flutter error, to test error handling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"throwFlutterError" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.throwFlutterError", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -565,8 +585,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in int. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoInt", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -587,8 +609,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in double. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoDouble", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -610,8 +634,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in boolean. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoBool", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -632,8 +658,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in string. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -655,8 +683,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in Uint8List. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoUint8List", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -678,8 +708,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in generic Object. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoObject", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -701,8 +733,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed list, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoList", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -723,8 +757,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed map, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoMap", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -745,8 +781,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed map to test nested class serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoClassWrapper" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoClassWrapper", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -768,8 +806,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed enum to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoEnum" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoEnum", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -791,8 +831,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the default string. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoNamedDefaultString" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNamedDefaultString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -814,8 +856,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in double. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoOptionalDefaultDouble" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoOptionalDefaultDouble", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -837,8 +882,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in int. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoRequiredInt" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoRequiredInt", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -860,8 +907,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed object, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAllNullableTypes" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAllNullableTypes", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -883,8 +932,12 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed object, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAllNullableTypesWithoutRecursion" + initWithName: + [NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAllNullableTypesWithoutRecursion", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -908,8 +961,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// sending of nested objects. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"extractNestedNullableString" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.extractNestedNullableString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -932,8 +988,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// sending of nested objects. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"createNestedNullableString" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.createNestedNullableString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -956,8 +1015,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in arguments of multiple types. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"sendMultipleNullableTypes" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.sendMultipleNullableTypes", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -985,8 +1047,12 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in arguments of multiple types. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"sendMultipleNullableTypesWithoutRecursion" + initWithName:[NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1015,8 +1081,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in int. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNullableInt", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1038,8 +1106,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in double. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoNullableDouble" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNullableDouble", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1061,8 +1131,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in boolean. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoNullableBool" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNullableBool", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1084,8 +1156,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in string. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoNullableString" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNullableString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1107,8 +1181,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in Uint8List. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoNullableUint8List" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNullableUint8List", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1131,8 +1207,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in generic Object. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoNullableObject" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNullableObject", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1154,8 +1232,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed list, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoNullableList" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNullableList", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1177,8 +1257,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed map, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNullableMap", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1199,8 +1281,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoNullableEnum" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNullableEnum", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1227,8 +1311,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in int. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoOptionalNullableInt" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoOptionalNullableInt", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1250,8 +1337,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in string. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoNamedNullableString" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNamedNullableString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1274,8 +1364,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// test basic asynchronous calling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.noopAsync", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1295,8 +1387,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in int asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncInt", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1319,8 +1413,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in double asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncDouble", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1343,8 +1439,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in boolean asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncBool", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1367,8 +1465,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed string asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1391,8 +1491,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in Uint8List asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncUint8List" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncUint8List", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1416,8 +1518,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in generic Object asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncObject", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1440,8 +1544,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed list, to test asynchronous serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncList", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1464,8 +1570,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed map, to test asynchronous serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncMap", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1489,8 +1597,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed enum, to test asynchronous serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncEnum" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncEnum", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1515,8 +1625,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Responds with an error from an async function returning a value. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.throwAsyncError", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1536,8 +1648,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Responds with an error from an async void function. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"throwAsyncErrorFromVoid" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.throwAsyncErrorFromVoid", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1557,8 +1672,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Responds with a Flutter error from an async function returning a value. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"throwAsyncFlutterError" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.throwAsyncFlutterError", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1579,8 +1696,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed object, to test async serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncAllTypes" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncAllTypes", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1603,8 +1722,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed object, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableAllNullableTypes" + initWithName:[NSString stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1628,8 +1750,12 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed object, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableAllNullableTypesWithoutRecursion" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi." + @"echoAsyncNullableAllNullableTypesWithoutRecursion", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1655,8 +1781,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in int asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableInt" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableInt", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1679,8 +1807,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in double asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableDouble" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableDouble", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1703,8 +1834,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in boolean asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableBool" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableBool", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1727,8 +1860,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed string asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableString" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1751,8 +1887,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in Uint8List asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableUint8List" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableUint8List", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1776,8 +1915,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in generic Object asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableObject" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableObject", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1800,8 +1942,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed list, to test asynchronous serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableList" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableList", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1824,8 +1968,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed map, to test asynchronous serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableMap" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableMap", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1849,8 +1995,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed enum, to test asynchronous serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableEnum" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableEnum", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1879,8 +2027,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterNoop", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1899,8 +2049,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterThrowError" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterThrowError", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1920,8 +2072,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterThrowErrorFromVoid" + initWithName: + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterThrowErrorFromVoid", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1940,8 +2095,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoAllTypes" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoAllTypes", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1964,8 +2122,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoAllNullableTypes" + initWithName: + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoAllNullableTypes", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -1988,8 +2149,12 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterSendMultipleNullableTypes" + initWithName: + [NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2017,8 +2182,12 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoAllNullableTypesWithoutRecursion" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi." + @"callFlutterEchoAllNullableTypesWithoutRecursion", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2043,8 +2212,12 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterSendMultipleNullableTypesWithoutRecursion" + initWithName: + [NSString stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterSendMultipleNullableTypesWithoutRecursion", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2077,8 +2250,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoBool" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoBool", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2100,8 +2275,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoInt" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoInt", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2123,8 +2300,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoDouble" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoDouble", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2146,8 +2325,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoString" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2169,8 +2350,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoUint8List" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoUint8List", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2193,8 +2377,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoList" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoList", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2216,8 +2402,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoMap" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoMap", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2240,8 +2428,10 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoEnum" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoEnum", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2266,8 +2456,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoNullableBool" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoNullableBool", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2290,8 +2483,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoNullableInt" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoNullableInt", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2314,8 +2510,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoNullableDouble" + initWithName: + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoNullableDouble", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2338,8 +2537,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoNullableString" + initWithName: + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoNullableString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2362,8 +2564,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoNullableUint8List" + initWithName:[NSString stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoNullableUint8List", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2386,8 +2591,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoNullableList" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoNullableList", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2410,8 +2618,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoNullableMap" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoNullableMap", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2434,8 +2645,11 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoNullableEnum" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoNullableEnum", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostIntegrationCoreApiGetCodec()]; if (api) { @@ -2463,6 +2677,33 @@ void SetUpFLTHostIntegrationCoreApi(id binaryMessenger, [channel setMessageHandler:nil]; } } + { + FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] + initWithName: + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterSmallApiEchoString", + messageChannelSuffix] + binaryMessenger:binaryMessenger + codec:FLTHostIntegrationCoreApiGetCodec()]; + if (api) { + NSCAssert([api respondsToSelector:@selector(callFlutterSmallApiEchoString:completion:)], + @"FLTHostIntegrationCoreApi api (%@) doesn't respond to " + @"@selector(callFlutterSmallApiEchoString:completion:)", + api); + [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { + NSArray *args = message; + NSString *arg_aString = GetNullableObjectAtIndex(args, 0); + [api callFlutterSmallApiEchoString:arg_aString + completion:^(NSString *_Nullable output, + FlutterError *_Nullable error) { + callback(wrapResult(output, error)); + }]; + }]; + } else { + [channel setMessageHandler:nil]; + } + } } @interface FLTFlutterIntegrationCoreApiCodecReader : FlutterStandardReader @end @@ -2534,20 +2775,30 @@ - (FlutterStandardReader *)readerWithData:(NSData *)data { @interface FLTFlutterIntegrationCoreApi () @property(nonatomic, strong) NSObject *binaryMessenger; +@property(nonatomic, strong) NSString *messageChannelSuffix; @end @implementation FLTFlutterIntegrationCoreApi - (instancetype)initWithBinaryMessenger:(NSObject *)binaryMessenger { - self = [super init]; + return [self initWithBinaryMessenger:binaryMessenger messageChannelSuffix:@""]; +} +- (instancetype)initWithBinaryMessenger:(NSObject *)binaryMessenger + messageChannelSuffix:(nullable NSString *)messageChannelSuffix { + self = [self init]; if (self) { _binaryMessenger = binaryMessenger; + _messageChannelSuffix = [messageChannelSuffix length] == 0 + ? @"" + : [NSString stringWithFormat:@".%@", messageChannelSuffix]; } return self; } - (void)noopWithCompletion:(void (^)(FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2568,8 +2819,11 @@ - (void)noopWithCompletion:(void (^)(FlutterError *_Nullable))completion { }]; } - (void)throwErrorWithCompletion:(void (^)(id _Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2592,7 +2846,10 @@ - (void)throwErrorWithCompletion:(void (^)(id _Nullable, FlutterError *_Nullable } - (void)throwErrorFromVoidWithCompletion:(void (^)(FlutterError *_Nullable))completion { NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwErrorFromVoid"; + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.throwErrorFromVoid", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2614,8 +2871,11 @@ - (void)throwErrorFromVoidWithCompletion:(void (^)(FlutterError *_Nullable))comp } - (void)echoAllTypes:(FLTAllTypes *)arg_everything completion:(void (^)(FLTAllTypes *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2640,7 +2900,10 @@ - (void)echoAllNullableTypes:(nullable FLTAllNullableTypes *)arg_everything completion:(void (^)(FLTAllNullableTypes *_Nullable, FlutterError *_Nullable))completion { NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes"; + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.echoAllNullableTypes", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2666,8 +2929,11 @@ - (void)sendMultipleNullableTypesABool:(nullable NSNumber *)arg_aNullableBool aString:(nullable NSString *)arg_aNullableString completion:(void (^)(FLTAllNullableTypes *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - @"sendMultipleNullableTypes"; + NSString *channelName = + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.sendMultipleNullableTypes", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2696,8 +2962,11 @@ - (void)echoAllNullableTypesWithoutRecursion: completion: (void (^)(FLTAllNullableTypesWithoutRecursion *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - @"echoAllNullableTypesWithoutRecursion"; + NSString *channelName = + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.echoAllNullableTypesWithoutRecursion", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2726,8 +2995,11 @@ - (void)sendMultipleNullableTypesWithoutRecursionABool:(nullable NSNumber *)arg_ (void (^)( FLTAllNullableTypesWithoutRecursion *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - @"sendMultipleNullableTypesWithoutRecursion"; + NSString *channelName = [NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + @"sendMultipleNullableTypesWithoutRecursion", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2754,8 +3026,11 @@ - (void)sendMultipleNullableTypesWithoutRecursionABool:(nullable NSNumber *)arg_ } - (void)echoBool:(BOOL)arg_aBool completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2778,8 +3053,10 @@ - (void)echoBool:(BOOL)arg_aBool } - (void)echoInt:(NSInteger)arg_anInt completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2802,8 +3079,11 @@ - (void)echoInt:(NSInteger)arg_anInt } - (void)echoDouble:(double)arg_aDouble completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2826,8 +3106,11 @@ - (void)echoDouble:(double)arg_aDouble } - (void)echoString:(NSString *)arg_aString completion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2851,8 +3134,11 @@ - (void)echoString:(NSString *)arg_aString - (void)echoUint8List:(FlutterStandardTypedData *)arg_aList completion: (void (^)(FlutterStandardTypedData *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2876,8 +3162,11 @@ - (void)echoUint8List:(FlutterStandardTypedData *)arg_aList } - (void)echoList:(NSArray *)arg_aList completion:(void (^)(NSArray *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2901,8 +3190,10 @@ - (void)echoList:(NSArray *)arg_aList - (void)echoMap:(NSDictionary *)arg_aMap completion: (void (^)(NSDictionary *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2926,8 +3217,11 @@ - (void)echoMap:(NSDictionary *)arg_aMap } - (void)echoEnum:(FLTAnEnum)arg_anEnum completion:(void (^)(FLTAnEnumBox *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnum"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnum", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2954,8 +3248,11 @@ - (void)echoEnum:(FLTAnEnum)arg_anEnum } - (void)echoNullableBool:(nullable NSNumber *)arg_aBool completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2978,8 +3275,11 @@ - (void)echoNullableBool:(nullable NSNumber *)arg_aBool } - (void)echoNullableInt:(nullable NSNumber *)arg_anInt completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3003,7 +3303,10 @@ - (void)echoNullableInt:(nullable NSNumber *)arg_anInt - (void)echoNullableDouble:(nullable NSNumber *)arg_aDouble completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble"; + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.echoNullableDouble", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3027,7 +3330,10 @@ - (void)echoNullableDouble:(nullable NSNumber *)arg_aDouble - (void)echoNullableString:(nullable NSString *)arg_aString completion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion { NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString"; + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.echoNullableString", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3051,8 +3357,11 @@ - (void)echoNullableString:(nullable NSString *)arg_aString - (void)echoNullableUint8List:(nullable FlutterStandardTypedData *)arg_aList completion:(void (^)(FlutterStandardTypedData *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - @"echoNullableUint8List"; + NSString *channelName = + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.echoNullableUint8List", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3076,8 +3385,11 @@ - (void)echoNullableUint8List:(nullable FlutterStandardTypedData *)arg_aList } - (void)echoNullableList:(nullable NSArray *)arg_aList completion:(void (^)(NSArray *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3101,8 +3413,11 @@ - (void)echoNullableList:(nullable NSArray *)arg_aList - (void)echoNullableMap:(nullable NSDictionary *)arg_aMap completion:(void (^)(NSDictionary *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3126,8 +3441,11 @@ - (void)echoNullableMap:(nullable NSDictionary *)arg_aMap } - (void)echoNullableEnum:(nullable FLTAnEnumBox *)arg_anEnum completion:(void (^)(FLTAnEnumBox *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnum"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnum", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3154,8 +3472,11 @@ - (void)echoNullableEnum:(nullable FLTAnEnumBox *)arg_anEnum }]; } - (void)noopAsyncWithCompletion:(void (^)(FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3177,8 +3498,11 @@ - (void)noopAsyncWithCompletion:(void (^)(FlutterError *_Nullable))completion { } - (void)echoAsyncString:(NSString *)arg_aString completion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3209,9 +3533,22 @@ - (void)echoAsyncString:(NSString *)arg_aString void SetUpFLTHostTrivialApi(id binaryMessenger, NSObject *api) { + SetUpFLTHostTrivialApiWithSuffix(binaryMessenger, api, @""); +} + +void SetUpFLTHostTrivialApiWithSuffix(id binaryMessenger, + NSObject *api, + NSString *messageChannelSuffix) { + messageChannelSuffix = messageChannelSuffix.length > 0 + ? [NSString stringWithFormat:@".%@", messageChannelSuffix] + : @""; { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop" + initWithName:[NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostTrivialApiGetCodec()]; if (api) { @@ -3235,9 +3572,22 @@ void SetUpFLTHostTrivialApi(id binaryMessenger, void SetUpFLTHostSmallApi(id binaryMessenger, NSObject *api) { + SetUpFLTHostSmallApiWithSuffix(binaryMessenger, api, @""); +} + +void SetUpFLTHostSmallApiWithSuffix(id binaryMessenger, + NSObject *api, + NSString *messageChannelSuffix) { + messageChannelSuffix = messageChannelSuffix.length > 0 + ? [NSString stringWithFormat:@".%@", messageChannelSuffix] + : @""; { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo" + initWithName:[NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostSmallApiGetCodec()]; if (api) { @@ -3258,7 +3608,10 @@ void SetUpFLTHostSmallApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostSmallApi.voidVoid", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:FLTHostSmallApiGetCodec()]; if (api) { @@ -3325,21 +3678,31 @@ - (FlutterStandardReader *)readerWithData:(NSData *)data { @interface FLTFlutterSmallApi () @property(nonatomic, strong) NSObject *binaryMessenger; +@property(nonatomic, strong) NSString *messageChannelSuffix; @end @implementation FLTFlutterSmallApi - (instancetype)initWithBinaryMessenger:(NSObject *)binaryMessenger { - self = [super init]; + return [self initWithBinaryMessenger:binaryMessenger messageChannelSuffix:@""]; +} +- (instancetype)initWithBinaryMessenger:(NSObject *)binaryMessenger + messageChannelSuffix:(nullable NSString *)messageChannelSuffix { + self = [self init]; if (self) { _binaryMessenger = binaryMessenger; + _messageChannelSuffix = [messageChannelSuffix length] == 0 + ? @"" + : [NSString stringWithFormat:@".%@", messageChannelSuffix]; } return self; } - (void)echoWrappedList:(FLTTestMessage *)arg_msg completion:(void (^)(FLTTestMessage *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", @"dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3362,7 +3725,10 @@ - (void)echoWrappedList:(FLTTestMessage *)arg_msg } - (void)echoString:(NSString *)arg_aString completion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = @"dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString"; + NSString *channelName = [NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/AlternateLanguageTestPlugin.h b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/AlternateLanguageTestPlugin.h index 6e1e3393fa79..6f0ca22d057c 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/AlternateLanguageTestPlugin.h +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/AlternateLanguageTestPlugin.h @@ -8,3 +8,8 @@ @interface AlternateLanguageTestPlugin : NSObject @end + +@interface AlternateLanguageTestAPIWithSuffix : NSObject ++ (void)registerWithRegistrar:(NSObject *)registrar + suffix:(NSString *)suffix; +@end diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/AlternateLanguageTestPlugin.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/AlternateLanguageTestPlugin.m index ea91a7eaa1b1..b35ac7907ec0 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/AlternateLanguageTestPlugin.m +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/AlternateLanguageTestPlugin.m @@ -8,6 +8,8 @@ @interface AlternateLanguageTestPlugin () @property(nonatomic) FlutterIntegrationCoreApi *flutterAPI; +@property(nonatomic) FlutterSmallApi *flutterSmallApiOne; +@property(nonatomic) FlutterSmallApi *flutterSmallApiTwo; @end /// This plugin handles the native side of the integration tests in example/integration_test/. @@ -15,8 +17,14 @@ @implementation AlternateLanguageTestPlugin + (void)registerWithRegistrar:(NSObject *)registrar { AlternateLanguageTestPlugin *plugin = [[AlternateLanguageTestPlugin alloc] init]; SetUpHostIntegrationCoreApi(registrar.messenger, plugin); + [AlternateLanguageTestAPIWithSuffix registerWithRegistrar:registrar suffix:@"suffixOne"]; + [AlternateLanguageTestAPIWithSuffix registerWithRegistrar:registrar suffix:@"suffixTwo"]; plugin.flutterAPI = [[FlutterIntegrationCoreApi alloc] initWithBinaryMessenger:registrar.messenger]; + plugin.flutterSmallApiOne = [[FlutterSmallApi alloc] initWithBinaryMessenger:registrar.messenger + messageChannelSuffix:@"suffixOne"]; + plugin.flutterSmallApiTwo = [[FlutterSmallApi alloc] initWithBinaryMessenger:registrar.messenger + messageChannelSuffix:@"suffixTwo"]; } #pragma mark HostIntegrationCoreApi implementation @@ -563,4 +571,53 @@ - (void)callFlutterEchoNullableEnum:(nullable AnEnumBox *)AnEnumBoxed }]; } +- (void)callFlutterSmallApiEchoString:(nonnull NSString *)aString + completion:(nonnull void (^)(NSString *_Nullable, + FlutterError *_Nullable))completion { + [self.flutterSmallApiOne + echoString:aString + completion:^(NSString *valueOne, FlutterError *error) { + [self.flutterSmallApiTwo + echoString:aString + completion:^(NSString *valueTwo, FlutterError *error) { + if ([valueOne isEqualToString:valueTwo]) { + completion(valueTwo, error); + } else { + completion( + nil, + [FlutterError + errorWithCode:@"Responses do not match" + message:[NSString stringWithFormat: + @"%@%@%@%@", + @"Multi-instance responses were not matching: ", + valueOne, @", ", valueTwo] + details:nil]); + } + }]; + }]; +} + +@end + +@interface AlternateLanguageTestAPIWithSuffix () +@end + +@implementation AlternateLanguageTestAPIWithSuffix ++ (void)registerWithRegistrar:(NSObject *)registrar + suffix:(NSString *)suffix { + AlternateLanguageTestAPIWithSuffix *api = [[AlternateLanguageTestAPIWithSuffix alloc] init]; + SetUpHostSmallApiWithSuffix(registrar.messenger, api, suffix); +} + +#pragma mark HostSmallAPI implementation + +- (void)echoString:(nonnull NSString *)aString + completion:(nonnull void (^)(NSString *_Nullable, FlutterError *_Nullable))completion { + completion(aString, nil); +} + +- (void)voidVoidWithCompletion:(nonnull void (^)(FlutterError *_Nullable))completion { + completion(nil); +} + @end diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.h b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.h index a7ec37232c18..4d6fc8de326b 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.h +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.h @@ -471,11 +471,18 @@ NSObject *HostIntegrationCoreApiGetCodec(void); - (void)callFlutterEchoNullableEnum:(nullable AnEnumBox *)anEnumBoxed completion: (void (^)(AnEnumBox *_Nullable, FlutterError *_Nullable))completion; +- (void)callFlutterSmallApiEchoString:(NSString *)aString + completion: + (void (^)(NSString *_Nullable, FlutterError *_Nullable))completion; @end extern void SetUpHostIntegrationCoreApi(id binaryMessenger, NSObject *_Nullable api); +extern void SetUpHostIntegrationCoreApiWithSuffix(id binaryMessenger, + NSObject *_Nullable api, + NSString *messageChannelSuffix); + /// The codec used by FlutterIntegrationCoreApi. NSObject *FlutterIntegrationCoreApiGetCodec(void); @@ -483,6 +490,8 @@ NSObject *FlutterIntegrationCoreApiGetCodec(void); /// integration tests to call into. @interface FlutterIntegrationCoreApi : NSObject - (instancetype)initWithBinaryMessenger:(id)binaryMessenger; +- (instancetype)initWithBinaryMessenger:(id)binaryMessenger + messageChannelSuffix:(nullable NSString *)messageChannelSuffix; /// A no-op function taking no arguments and returning no value, to sanity /// test basic calling. - (void)noopWithCompletion:(void (^)(FlutterError *_Nullable))completion; @@ -590,6 +599,10 @@ NSObject *HostTrivialApiGetCodec(void); extern void SetUpHostTrivialApi(id binaryMessenger, NSObject *_Nullable api); +extern void SetUpHostTrivialApiWithSuffix(id binaryMessenger, + NSObject *_Nullable api, + NSString *messageChannelSuffix); + /// The codec used by HostSmallApi. NSObject *HostSmallApiGetCodec(void); @@ -603,12 +616,18 @@ NSObject *HostSmallApiGetCodec(void); extern void SetUpHostSmallApi(id binaryMessenger, NSObject *_Nullable api); +extern void SetUpHostSmallApiWithSuffix(id binaryMessenger, + NSObject *_Nullable api, + NSString *messageChannelSuffix); + /// The codec used by FlutterSmallApi. NSObject *FlutterSmallApiGetCodec(void); /// A simple API called in some unit tests. @interface FlutterSmallApi : NSObject - (instancetype)initWithBinaryMessenger:(id)binaryMessenger; +- (instancetype)initWithBinaryMessenger:(id)binaryMessenger + messageChannelSuffix:(nullable NSString *)messageChannelSuffix; - (void)echoWrappedList:(TestMessage *)msg completion:(void (^)(TestMessage *_Nullable, FlutterError *_Nullable))completion; - (void)echoString:(NSString *)aString diff --git a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.m b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.m index b90345836c5a..7d1fbdae8248 100644 --- a/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.m +++ b/packages/pigeon/platform_tests/alternate_language_test_plugin/macos/Classes/CoreTests.gen.m @@ -454,11 +454,23 @@ - (FlutterStandardReader *)readerWithData:(NSData *)data { void SetUpHostIntegrationCoreApi(id binaryMessenger, NSObject *api) { + SetUpHostIntegrationCoreApiWithSuffix(binaryMessenger, api, @""); +} + +void SetUpHostIntegrationCoreApiWithSuffix(id binaryMessenger, + NSObject *api, + NSString *messageChannelSuffix) { + messageChannelSuffix = messageChannelSuffix.length > 0 + ? [NSString stringWithFormat:@".%@", messageChannelSuffix] + : @""; /// A no-op function taking no arguments and returning no value, to sanity /// test basic calling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.noop", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -477,8 +489,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed object, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAllTypes", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -500,8 +514,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns an error, to test error handling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.throwError", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -521,8 +537,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns an error from a void function, to test error handling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"throwErrorFromVoid" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.throwErrorFromVoid", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -542,8 +560,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns a Flutter error, to test error handling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"throwFlutterError" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.throwFlutterError", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -563,8 +583,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in int. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoInt", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -585,8 +607,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in double. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoDouble", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -607,8 +631,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in boolean. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoBool", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -629,8 +655,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in string. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -651,8 +679,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in Uint8List. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoUint8List", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -674,8 +704,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in generic Object. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoObject", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -696,8 +728,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed list, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoList", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -718,8 +752,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed map, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoMap", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -740,8 +776,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed map to test nested class serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoClassWrapper" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoClassWrapper", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -763,8 +801,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed enum to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoEnum" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoEnum", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -786,8 +826,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the default string. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoNamedDefaultString" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNamedDefaultString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -809,8 +851,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in double. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoOptionalDefaultDouble" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoOptionalDefaultDouble", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -832,8 +877,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in int. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoRequiredInt" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoRequiredInt", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -855,8 +902,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed object, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAllNullableTypes" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAllNullableTypes", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -878,8 +927,12 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed object, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAllNullableTypesWithoutRecursion" + initWithName: + [NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAllNullableTypesWithoutRecursion", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -903,8 +956,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// sending of nested objects. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"extractNestedNullableString" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.extractNestedNullableString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -927,8 +983,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// sending of nested objects. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"createNestedNullableString" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.createNestedNullableString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -951,8 +1010,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in arguments of multiple types. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"sendMultipleNullableTypes" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.sendMultipleNullableTypes", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -980,8 +1042,12 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in arguments of multiple types. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"sendMultipleNullableTypesWithoutRecursion" + initWithName:[NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1010,8 +1076,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in int. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNullableInt", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1033,8 +1101,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in double. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoNullableDouble" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNullableDouble", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1056,8 +1126,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in boolean. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoNullableBool" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNullableBool", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1079,8 +1151,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in string. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoNullableString" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNullableString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1102,8 +1176,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in Uint8List. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoNullableUint8List" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNullableUint8List", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1126,8 +1202,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in generic Object. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoNullableObject" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNullableObject", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1149,8 +1227,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed list, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoNullableList" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNullableList", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1172,8 +1252,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed map, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNullableMap", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1194,8 +1276,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoNullableEnum" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNullableEnum", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1222,8 +1306,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in int. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoOptionalNullableInt" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoOptionalNullableInt", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1245,8 +1332,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in string. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoNamedNullableString" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoNamedNullableString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1269,8 +1359,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// test basic asynchronous calling. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.noopAsync", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1290,8 +1382,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in int asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncInt", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1314,8 +1408,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in double asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncDouble", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1338,8 +1434,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in boolean asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncBool", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1362,8 +1460,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed string asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1386,8 +1486,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in Uint8List asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncUint8List" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncUint8List", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1411,8 +1513,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in generic Object asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncObject", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1435,8 +1539,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed list, to test asynchronous serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncList", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1459,8 +1565,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed map, to test asynchronous serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncMap", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1484,8 +1592,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed enum, to test asynchronous serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncEnum" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncEnum", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1510,8 +1620,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Responds with an error from an async function returning a value. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.throwAsyncError", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1531,8 +1643,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Responds with an error from an async void function. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"throwAsyncErrorFromVoid" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.throwAsyncErrorFromVoid", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1552,8 +1667,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Responds with a Flutter error from an async function returning a value. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"throwAsyncFlutterError" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.throwAsyncFlutterError", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1574,8 +1691,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed object, to test async serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncAllTypes" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncAllTypes", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1598,8 +1717,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed object, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableAllNullableTypes" + initWithName:[NSString stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1623,8 +1745,12 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed object, to test serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableAllNullableTypesWithoutRecursion" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi." + @"echoAsyncNullableAllNullableTypesWithoutRecursion", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1650,8 +1776,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in int asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableInt" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableInt", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1674,8 +1802,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns passed in double asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableDouble" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableDouble", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1698,8 +1829,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in boolean asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableBool" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableBool", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1722,8 +1855,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed string asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableString" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1746,8 +1882,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in Uint8List asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableUint8List" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableUint8List", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1771,8 +1910,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed in generic Object asynchronously. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableObject" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableObject", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1795,8 +1937,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed list, to test asynchronous serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableList" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableList", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1819,8 +1963,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed map, to test asynchronous serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableMap" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableMap", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1844,8 +1990,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, /// Returns the passed enum, to test asynchronous serialization and deserialization. { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"echoAsyncNullableEnum" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.echoAsyncNullableEnum", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1874,8 +2022,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName: - @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterNoop", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1894,8 +2044,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterThrowError" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterThrowError", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1915,8 +2067,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterThrowErrorFromVoid" + initWithName: + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterThrowErrorFromVoid", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1935,8 +2090,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoAllTypes" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoAllTypes", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1958,8 +2116,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoAllNullableTypes" + initWithName: + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoAllNullableTypes", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -1982,8 +2143,12 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterSendMultipleNullableTypes" + initWithName: + [NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2011,8 +2176,12 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoAllNullableTypesWithoutRecursion" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi." + @"callFlutterEchoAllNullableTypesWithoutRecursion", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2037,8 +2206,12 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterSendMultipleNullableTypesWithoutRecursion" + initWithName: + [NSString stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + @"callFlutterSendMultipleNullableTypesWithoutRecursion", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2071,8 +2244,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoBool" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoBool", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2094,8 +2269,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoInt" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoInt", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2117,8 +2294,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoDouble" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoDouble", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2140,8 +2319,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoString" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2163,8 +2344,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoUint8List" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoUint8List", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2187,8 +2371,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoList" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoList", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2210,8 +2396,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoMap" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoMap", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2234,8 +2422,10 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoEnum" + initWithName:[NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoEnum", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2259,8 +2449,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoNullableBool" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoNullableBool", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2283,8 +2476,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoNullableInt" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoNullableInt", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2307,8 +2503,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoNullableDouble" + initWithName: + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoNullableDouble", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2331,8 +2530,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoNullableString" + initWithName: + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoNullableString", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2355,8 +2557,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoNullableUint8List" + initWithName:[NSString stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoNullableUint8List", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2379,8 +2584,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoNullableList" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoNullableList", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2403,8 +2611,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoNullableMap" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoNullableMap", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2427,8 +2638,11 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, } { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - @"callFlutterEchoNullableEnum" + initWithName:[NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterEchoNullableEnum", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostIntegrationCoreApiGetCodec()]; if (api) { @@ -2456,6 +2670,33 @@ void SetUpHostIntegrationCoreApi(id binaryMessenger, [channel setMessageHandler:nil]; } } + { + FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] + initWithName: + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"HostIntegrationCoreApi.callFlutterSmallApiEchoString", + messageChannelSuffix] + binaryMessenger:binaryMessenger + codec:HostIntegrationCoreApiGetCodec()]; + if (api) { + NSCAssert([api respondsToSelector:@selector(callFlutterSmallApiEchoString:completion:)], + @"HostIntegrationCoreApi api (%@) doesn't respond to " + @"@selector(callFlutterSmallApiEchoString:completion:)", + api); + [channel setMessageHandler:^(id _Nullable message, FlutterReply callback) { + NSArray *args = message; + NSString *arg_aString = GetNullableObjectAtIndex(args, 0); + [api callFlutterSmallApiEchoString:arg_aString + completion:^(NSString *_Nullable output, + FlutterError *_Nullable error) { + callback(wrapResult(output, error)); + }]; + }]; + } else { + [channel setMessageHandler:nil]; + } + } } @interface FlutterIntegrationCoreApiCodecReader : FlutterStandardReader @end @@ -2527,20 +2768,30 @@ - (FlutterStandardReader *)readerWithData:(NSData *)data { @interface FlutterIntegrationCoreApi () @property(nonatomic, strong) NSObject *binaryMessenger; +@property(nonatomic, strong) NSString *messageChannelSuffix; @end @implementation FlutterIntegrationCoreApi - (instancetype)initWithBinaryMessenger:(NSObject *)binaryMessenger { - self = [super init]; + return [self initWithBinaryMessenger:binaryMessenger messageChannelSuffix:@""]; +} +- (instancetype)initWithBinaryMessenger:(NSObject *)binaryMessenger + messageChannelSuffix:(nullable NSString *)messageChannelSuffix { + self = [self init]; if (self) { _binaryMessenger = binaryMessenger; + _messageChannelSuffix = [messageChannelSuffix length] == 0 + ? @"" + : [NSString stringWithFormat:@".%@", messageChannelSuffix]; } return self; } - (void)noopWithCompletion:(void (^)(FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2561,8 +2812,11 @@ - (void)noopWithCompletion:(void (^)(FlutterError *_Nullable))completion { }]; } - (void)throwErrorWithCompletion:(void (^)(id _Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2585,7 +2839,10 @@ - (void)throwErrorWithCompletion:(void (^)(id _Nullable, FlutterError *_Nullable } - (void)throwErrorFromVoidWithCompletion:(void (^)(FlutterError *_Nullable))completion { NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwErrorFromVoid"; + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.throwErrorFromVoid", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2607,8 +2864,11 @@ - (void)throwErrorFromVoidWithCompletion:(void (^)(FlutterError *_Nullable))comp } - (void)echoAllTypes:(AllTypes *)arg_everything completion:(void (^)(AllTypes *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2633,7 +2893,10 @@ - (void)echoAllNullableTypes:(nullable AllNullableTypes *)arg_everything completion: (void (^)(AllNullableTypes *_Nullable, FlutterError *_Nullable))completion { NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes"; + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.echoAllNullableTypes", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2659,8 +2922,11 @@ - (void)sendMultipleNullableTypesABool:(nullable NSNumber *)arg_aNullableBool aString:(nullable NSString *)arg_aNullableString completion:(void (^)(AllNullableTypes *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - @"sendMultipleNullableTypes"; + NSString *channelName = + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.sendMultipleNullableTypes", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2688,8 +2954,11 @@ - (void)echoAllNullableTypesWithoutRecursion: (nullable AllNullableTypesWithoutRecursion *)arg_everything completion:(void (^)(AllNullableTypesWithoutRecursion *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - @"echoAllNullableTypesWithoutRecursion"; + NSString *channelName = + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.echoAllNullableTypesWithoutRecursion", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2718,8 +2987,11 @@ - (void)echoAllNullableTypesWithoutRecursion: completion: (void (^)(AllNullableTypesWithoutRecursion *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - @"sendMultipleNullableTypesWithoutRecursion"; + NSString *channelName = [NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." + @"sendMultipleNullableTypesWithoutRecursion", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2746,8 +3018,11 @@ - (void)echoAllNullableTypesWithoutRecursion: } - (void)echoBool:(BOOL)arg_aBool completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2770,8 +3045,10 @@ - (void)echoBool:(BOOL)arg_aBool } - (void)echoInt:(NSInteger)arg_anInt completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2794,8 +3071,11 @@ - (void)echoInt:(NSInteger)arg_anInt } - (void)echoDouble:(double)arg_aDouble completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2818,8 +3098,11 @@ - (void)echoDouble:(double)arg_aDouble } - (void)echoString:(NSString *)arg_aString completion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2843,8 +3126,11 @@ - (void)echoString:(NSString *)arg_aString - (void)echoUint8List:(FlutterStandardTypedData *)arg_aList completion: (void (^)(FlutterStandardTypedData *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2868,8 +3154,11 @@ - (void)echoUint8List:(FlutterStandardTypedData *)arg_aList } - (void)echoList:(NSArray *)arg_aList completion:(void (^)(NSArray *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2893,8 +3182,10 @@ - (void)echoList:(NSArray *)arg_aList - (void)echoMap:(NSDictionary *)arg_aMap completion: (void (^)(NSDictionary *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2918,8 +3209,11 @@ - (void)echoMap:(NSDictionary *)arg_aMap } - (void)echoEnum:(AnEnum)arg_anEnum completion:(void (^)(AnEnumBox *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnum"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnum", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2946,8 +3240,11 @@ - (void)echoEnum:(AnEnum)arg_anEnum } - (void)echoNullableBool:(nullable NSNumber *)arg_aBool completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2970,8 +3267,11 @@ - (void)echoNullableBool:(nullable NSNumber *)arg_aBool } - (void)echoNullableInt:(nullable NSNumber *)arg_anInt completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -2995,7 +3295,10 @@ - (void)echoNullableInt:(nullable NSNumber *)arg_anInt - (void)echoNullableDouble:(nullable NSNumber *)arg_aDouble completion:(void (^)(NSNumber *_Nullable, FlutterError *_Nullable))completion { NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble"; + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.echoNullableDouble", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3019,7 +3322,10 @@ - (void)echoNullableDouble:(nullable NSNumber *)arg_aDouble - (void)echoNullableString:(nullable NSString *)arg_aString completion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion { NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString"; + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.echoNullableString", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3043,8 +3349,11 @@ - (void)echoNullableString:(nullable NSString *)arg_aString - (void)echoNullableUint8List:(nullable FlutterStandardTypedData *)arg_aList completion:(void (^)(FlutterStandardTypedData *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - @"echoNullableUint8List"; + NSString *channelName = + [NSString stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests." + @"FlutterIntegrationCoreApi.echoNullableUint8List", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3068,8 +3377,11 @@ - (void)echoNullableUint8List:(nullable FlutterStandardTypedData *)arg_aList } - (void)echoNullableList:(nullable NSArray *)arg_aList completion:(void (^)(NSArray *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3093,8 +3405,11 @@ - (void)echoNullableList:(nullable NSArray *)arg_aList - (void)echoNullableMap:(nullable NSDictionary *)arg_aMap completion:(void (^)(NSDictionary *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3118,8 +3433,11 @@ - (void)echoNullableMap:(nullable NSDictionary *)arg_aMap } - (void)echoNullableEnum:(nullable AnEnumBox *)arg_anEnum completion:(void (^)(AnEnumBox *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnum"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnum", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3146,8 +3464,11 @@ - (void)echoNullableEnum:(nullable AnEnumBox *)arg_anEnum }]; } - (void)noopAsyncWithCompletion:(void (^)(FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3169,8 +3490,11 @@ - (void)noopAsyncWithCompletion:(void (^)(FlutterError *_Nullable))completion { } - (void)echoAsyncString:(NSString *)arg_aString completion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3201,9 +3525,21 @@ - (void)echoAsyncString:(NSString *)arg_aString void SetUpHostTrivialApi(id binaryMessenger, NSObject *api) { + SetUpHostTrivialApiWithSuffix(binaryMessenger, api, @""); +} + +void SetUpHostTrivialApiWithSuffix(id binaryMessenger, + NSObject *api, NSString *messageChannelSuffix) { + messageChannelSuffix = messageChannelSuffix.length > 0 + ? [NSString stringWithFormat:@".%@", messageChannelSuffix] + : @""; { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop" + initWithName:[NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostTrivialApiGetCodec()]; if (api) { @@ -3226,9 +3562,21 @@ void SetUpHostTrivialApi(id binaryMessenger, } void SetUpHostSmallApi(id binaryMessenger, NSObject *api) { + SetUpHostSmallApiWithSuffix(binaryMessenger, api, @""); +} + +void SetUpHostSmallApiWithSuffix(id binaryMessenger, + NSObject *api, NSString *messageChannelSuffix) { + messageChannelSuffix = messageChannelSuffix.length > 0 + ? [NSString stringWithFormat:@".%@", messageChannelSuffix] + : @""; { FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc] - initWithName:@"dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo" + initWithName:[NSString + stringWithFormat: + @"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo", + messageChannelSuffix] binaryMessenger:binaryMessenger codec:HostSmallApiGetCodec()]; if (api) { @@ -3248,7 +3596,10 @@ void SetUpHostSmallApi(id binaryMessenger, NSObject *binaryMessenger; +@property(nonatomic, strong) NSString *messageChannelSuffix; @end @implementation FlutterSmallApi - (instancetype)initWithBinaryMessenger:(NSObject *)binaryMessenger { - self = [super init]; + return [self initWithBinaryMessenger:binaryMessenger messageChannelSuffix:@""]; +} +- (instancetype)initWithBinaryMessenger:(NSObject *)binaryMessenger + messageChannelSuffix:(nullable NSString *)messageChannelSuffix { + self = [self init]; if (self) { _binaryMessenger = binaryMessenger; + _messageChannelSuffix = [messageChannelSuffix length] == 0 + ? @"" + : [NSString stringWithFormat:@".%@", messageChannelSuffix]; } return self; } - (void)echoWrappedList:(TestMessage *)arg_msg completion:(void (^)(TestMessage *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = - @"dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList"; + NSString *channelName = [NSString + stringWithFormat: + @"%@%@", @"dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger @@ -3352,7 +3713,10 @@ - (void)echoWrappedList:(TestMessage *)arg_msg } - (void)echoString:(NSString *)arg_aString completion:(void (^)(NSString *_Nullable, FlutterError *_Nullable))completion { - NSString *channelName = @"dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString"; + NSString *channelName = [NSString + stringWithFormat:@"%@%@", + @"dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString", + _messageChannelSuffix]; FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel messageChannelWithName:channelName binaryMessenger:self.binaryMessenger diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/integration_tests.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/integration_tests.dart index 876c3b149d7e..caa448cac366 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/integration_tests.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/integration_tests.dart @@ -1359,13 +1359,49 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) { }); }); + group('Host API with suffix', () { + testWidgets('echo string succeeds with suffix with multiple instances', + (_) async { + final HostSmallApi apiWithSuffixOne = + HostSmallApi(messageChannelSuffix: 'suffixOne'); + final HostSmallApi apiWithSuffixTwo = + HostSmallApi(messageChannelSuffix: 'suffixTwo'); + const String sentString = "I'm a computer"; + final String echoStringOne = await apiWithSuffixOne.echo(sentString); + final String echoStringTwo = await apiWithSuffixTwo.echo(sentString); + expect(sentString, echoStringOne); + expect(sentString, echoStringTwo); + }); + + testWidgets('multiple instances will have different method channel names', + (_) async { + // The only way to get the channel name back is to throw an exception. + // These APIs have no corresponding APIs on the host platforms. + final HostSmallApi apiWithSuffixOne = + HostSmallApi(messageChannelSuffix: 'suffixWithNoHost'); + final HostSmallApi apiWithSuffixTwo = + HostSmallApi(messageChannelSuffix: 'suffixWithoutHost'); + const String sentString = "I'm a computer"; + try { + await apiWithSuffixOne.echo(sentString); + } on PlatformException catch (e) { + expect(e.message, contains('suffixWithNoHost')); + } + try { + await apiWithSuffixTwo.echo(sentString); + } on PlatformException catch (e) { + expect(e.message, contains('suffixWithoutHost')); + } + }); + }); + // These tests rely on the async Dart->host calls to work correctly, since // the host->Dart call is wrapped in a driving Dart->host call, so any test // added to this group should have coverage of the relevant arguments and // return value in the "Host async API tests" group. group('Flutter API tests', () { setUp(() { - FlutterIntegrationCoreApi.setup(_FlutterApiTestImplementation()); + FlutterIntegrationCoreApi.setUp(_FlutterApiTestImplementation()); }); testWidgets('basic void->void call works', (WidgetTester _) async { @@ -1742,6 +1778,28 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) { expect(echoEnum, sentEnum); }); }); + + group('Flutter API with suffix', () { + setUp(() { + FlutterSmallApi.setUp( + _SmallFlutterApi(), + messageChannelSuffix: 'suffixOne', + ); + FlutterSmallApi.setUp( + _SmallFlutterApi(), + messageChannelSuffix: 'suffixTwo', + ); + }); + + testWidgets('echo string succeeds with suffix with multiple instances', + (_) async { + final HostIntegrationCoreApi api = HostIntegrationCoreApi(); + const String sentObject = "I'm a computer"; + final String echoObject = + await api.callFlutterSmallApiEchoString(sentObject); + expect(echoObject, sentObject); + }); + }); } class _FlutterApiTestImplementation implements FlutterIntegrationCoreApi { @@ -1848,3 +1906,15 @@ class _FlutterApiTestImplementation implements FlutterIntegrationCoreApi { return aString; } } + +class _SmallFlutterApi implements FlutterSmallApi { + @override + String echoString(String aString) { + return aString; + } + + @override + TestMessage echoWrappedList(TestMessage msg) { + return msg; + } +} diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/background_platform_channels.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/background_platform_channels.gen.dart index 7222e263b32b..461683120cee 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/background_platform_channels.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/background_platform_channels.gen.dart @@ -23,16 +23,21 @@ class BackgroundApi2Host { /// Constructor for [BackgroundApi2Host]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - BackgroundApi2Host({BinaryMessenger? binaryMessenger}) - : __pigeon_binaryMessenger = binaryMessenger; + BackgroundApi2Host( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : __pigeon_binaryMessenger = binaryMessenger, + __pigeon_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? __pigeon_binaryMessenger; static const MessageCodec pigeonChannelCodec = StandardMessageCodec(); + final String __pigeon_messageChannelSuffix; + Future add(int x, int y) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.BackgroundApi2Host.add'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.BackgroundApi2Host.add$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart index 1b3bc1f5304e..9c1649466262 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart @@ -440,18 +440,23 @@ class HostIntegrationCoreApi { /// Constructor for [HostIntegrationCoreApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - HostIntegrationCoreApi({BinaryMessenger? binaryMessenger}) - : __pigeon_binaryMessenger = binaryMessenger; + HostIntegrationCoreApi( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : __pigeon_binaryMessenger = binaryMessenger, + __pigeon_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? __pigeon_binaryMessenger; static const MessageCodec pigeonChannelCodec = _HostIntegrationCoreApiCodec(); + final String __pigeon_messageChannelSuffix; + /// A no-op function taking no arguments and returning no value, to sanity /// test basic calling. Future noop() async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -475,8 +480,8 @@ class HostIntegrationCoreApi { /// Returns the passed object, to test serialization and deserialization. Future echoAllTypes(AllTypes everything) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -505,8 +510,8 @@ class HostIntegrationCoreApi { /// Returns an error, to test error handling. Future throwError() async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -530,8 +535,8 @@ class HostIntegrationCoreApi { /// Returns an error from a void function, to test error handling. Future throwErrorFromVoid() async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwErrorFromVoid'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwErrorFromVoid$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -555,8 +560,8 @@ class HostIntegrationCoreApi { /// Returns a Flutter error, to test error handling. Future throwFlutterError() async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwFlutterError'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwFlutterError$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -580,8 +585,8 @@ class HostIntegrationCoreApi { /// Returns passed in int. Future echoInt(int anInt) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -610,8 +615,8 @@ class HostIntegrationCoreApi { /// Returns passed in double. Future echoDouble(double aDouble) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -640,8 +645,8 @@ class HostIntegrationCoreApi { /// Returns the passed in boolean. Future echoBool(bool aBool) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -670,8 +675,8 @@ class HostIntegrationCoreApi { /// Returns the passed in string. Future echoString(String aString) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -700,8 +705,8 @@ class HostIntegrationCoreApi { /// Returns the passed in Uint8List. Future echoUint8List(Uint8List aUint8List) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -730,8 +735,8 @@ class HostIntegrationCoreApi { /// Returns the passed in generic Object. Future echoObject(Object anObject) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -760,8 +765,8 @@ class HostIntegrationCoreApi { /// Returns the passed list, to test serialization and deserialization. Future> echoList(List aList) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -790,8 +795,8 @@ class HostIntegrationCoreApi { /// Returns the passed map, to test serialization and deserialization. Future> echoMap(Map aMap) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -821,8 +826,8 @@ class HostIntegrationCoreApi { /// Returns the passed map to test nested class serialization and deserialization. Future echoClassWrapper(AllClassesWrapper wrapper) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassWrapper'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassWrapper$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -851,8 +856,8 @@ class HostIntegrationCoreApi { /// Returns the passed enum to test serialization and deserialization. Future echoEnum(AnEnum anEnum) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoEnum'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoEnum$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -881,8 +886,8 @@ class HostIntegrationCoreApi { /// Returns the default string. Future echoNamedDefaultString({String aString = 'default'}) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedDefaultString'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedDefaultString$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -911,8 +916,8 @@ class HostIntegrationCoreApi { /// Returns passed in double. Future echoOptionalDefaultDouble([double aDouble = 3.14]) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalDefaultDouble'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalDefaultDouble$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -941,8 +946,8 @@ class HostIntegrationCoreApi { /// Returns passed in int. Future echoRequiredInt({required int anInt}) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoRequiredInt'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoRequiredInt$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -972,8 +977,8 @@ class HostIntegrationCoreApi { /// Returns the passed object, to test serialization and deserialization. Future echoAllNullableTypes( AllNullableTypes? everything) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypes'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypes$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -999,8 +1004,8 @@ class HostIntegrationCoreApi { Future echoAllNullableTypesWithoutRecursion( AllNullableTypesWithoutRecursion? everything) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypesWithoutRecursion'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypesWithoutRecursion$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1025,8 +1030,8 @@ class HostIntegrationCoreApi { /// Returns the inner `aString` value from the wrapped object, to test /// sending of nested objects. Future extractNestedNullableString(AllClassesWrapper wrapper) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.extractNestedNullableString'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.extractNestedNullableString$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1052,8 +1057,8 @@ class HostIntegrationCoreApi { /// sending of nested objects. Future createNestedNullableString( String? nullableString) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.createNestedNullableString'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.createNestedNullableString$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1083,8 +1088,8 @@ class HostIntegrationCoreApi { /// Returns passed in arguments of multiple types. Future sendMultipleNullableTypes( bool? aNullableBool, int? aNullableInt, String? aNullableString) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypes'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypes$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1116,8 +1121,8 @@ class HostIntegrationCoreApi { Future sendMultipleNullableTypesWithoutRecursion(bool? aNullableBool, int? aNullableInt, String? aNullableString) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1147,8 +1152,8 @@ class HostIntegrationCoreApi { /// Returns passed in int. Future echoNullableInt(int? aNullableInt) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1172,8 +1177,8 @@ class HostIntegrationCoreApi { /// Returns passed in double. Future echoNullableDouble(double? aNullableDouble) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableDouble'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableDouble$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1197,8 +1202,8 @@ class HostIntegrationCoreApi { /// Returns the passed in boolean. Future echoNullableBool(bool? aNullableBool) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableBool'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableBool$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1222,8 +1227,8 @@ class HostIntegrationCoreApi { /// Returns the passed in string. Future echoNullableString(String? aNullableString) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableString'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableString$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1248,8 +1253,8 @@ class HostIntegrationCoreApi { /// Returns the passed in Uint8List. Future echoNullableUint8List( Uint8List? aNullableUint8List) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableUint8List'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableUint8List$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1273,8 +1278,8 @@ class HostIntegrationCoreApi { /// Returns the passed in generic Object. Future echoNullableObject(Object? aNullableObject) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableObject'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableObject$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1298,8 +1303,8 @@ class HostIntegrationCoreApi { /// Returns the passed list, to test serialization and deserialization. Future?> echoNullableList(List? aNullableList) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableList'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableList$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1324,8 +1329,8 @@ class HostIntegrationCoreApi { /// Returns the passed map, to test serialization and deserialization. Future?> echoNullableMap( Map? aNullableMap) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1349,8 +1354,8 @@ class HostIntegrationCoreApi { } Future echoNullableEnum(AnEnum? anEnum) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnum'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnum$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1376,8 +1381,8 @@ class HostIntegrationCoreApi { /// Returns passed in int. Future echoOptionalNullableInt([int? aNullableInt]) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalNullableInt'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalNullableInt$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1401,8 +1406,8 @@ class HostIntegrationCoreApi { /// Returns the passed in string. Future echoNamedNullableString({String? aNullableString}) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedNullableString'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedNullableString$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1427,8 +1432,8 @@ class HostIntegrationCoreApi { /// A no-op function taking no arguments and returning no value, to sanity /// test basic asynchronous calling. Future noopAsync() async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1452,8 +1457,8 @@ class HostIntegrationCoreApi { /// Returns passed in int asynchronously. Future echoAsyncInt(int anInt) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1482,8 +1487,8 @@ class HostIntegrationCoreApi { /// Returns passed in double asynchronously. Future echoAsyncDouble(double aDouble) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1512,8 +1517,8 @@ class HostIntegrationCoreApi { /// Returns the passed in boolean asynchronously. Future echoAsyncBool(bool aBool) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1542,8 +1547,8 @@ class HostIntegrationCoreApi { /// Returns the passed string asynchronously. Future echoAsyncString(String aString) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1572,8 +1577,8 @@ class HostIntegrationCoreApi { /// Returns the passed in Uint8List asynchronously. Future echoAsyncUint8List(Uint8List aUint8List) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncUint8List'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncUint8List$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1602,8 +1607,8 @@ class HostIntegrationCoreApi { /// Returns the passed in generic Object asynchronously. Future echoAsyncObject(Object anObject) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1632,8 +1637,8 @@ class HostIntegrationCoreApi { /// Returns the passed list, to test asynchronous serialization and deserialization. Future> echoAsyncList(List aList) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1662,8 +1667,8 @@ class HostIntegrationCoreApi { /// Returns the passed map, to test asynchronous serialization and deserialization. Future> echoAsyncMap(Map aMap) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1693,8 +1698,8 @@ class HostIntegrationCoreApi { /// Returns the passed enum, to test asynchronous serialization and deserialization. Future echoAsyncEnum(AnEnum anEnum) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncEnum'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncEnum$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1723,8 +1728,8 @@ class HostIntegrationCoreApi { /// Responds with an error from an async function returning a value. Future throwAsyncError() async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1748,8 +1753,8 @@ class HostIntegrationCoreApi { /// Responds with an error from an async void function. Future throwAsyncErrorFromVoid() async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncErrorFromVoid'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncErrorFromVoid$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1773,8 +1778,8 @@ class HostIntegrationCoreApi { /// Responds with a Flutter error from an async function returning a value. Future throwAsyncFlutterError() async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncFlutterError'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncFlutterError$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1798,8 +1803,8 @@ class HostIntegrationCoreApi { /// Returns the passed object, to test async serialization and deserialization. Future echoAsyncAllTypes(AllTypes everything) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncAllTypes'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncAllTypes$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1829,8 +1834,8 @@ class HostIntegrationCoreApi { /// Returns the passed object, to test serialization and deserialization. Future echoAsyncNullableAllNullableTypes( AllNullableTypes? everything) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1856,8 +1861,8 @@ class HostIntegrationCoreApi { Future echoAsyncNullableAllNullableTypesWithoutRecursion( AllNullableTypesWithoutRecursion? everything) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypesWithoutRecursion'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypesWithoutRecursion$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1881,8 +1886,8 @@ class HostIntegrationCoreApi { /// Returns passed in int asynchronously. Future echoAsyncNullableInt(int? anInt) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableInt'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableInt$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1906,8 +1911,8 @@ class HostIntegrationCoreApi { /// Returns passed in double asynchronously. Future echoAsyncNullableDouble(double? aDouble) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableDouble'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableDouble$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1931,8 +1936,8 @@ class HostIntegrationCoreApi { /// Returns the passed in boolean asynchronously. Future echoAsyncNullableBool(bool? aBool) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableBool'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableBool$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1956,8 +1961,8 @@ class HostIntegrationCoreApi { /// Returns the passed string asynchronously. Future echoAsyncNullableString(String? aString) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableString'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableString$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -1981,8 +1986,8 @@ class HostIntegrationCoreApi { /// Returns the passed in Uint8List asynchronously. Future echoAsyncNullableUint8List(Uint8List? aUint8List) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableUint8List'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableUint8List$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2006,8 +2011,8 @@ class HostIntegrationCoreApi { /// Returns the passed in generic Object asynchronously. Future echoAsyncNullableObject(Object? anObject) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableObject'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableObject$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2031,8 +2036,8 @@ class HostIntegrationCoreApi { /// Returns the passed list, to test asynchronous serialization and deserialization. Future?> echoAsyncNullableList(List? aList) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableList'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableList$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2057,8 +2062,8 @@ class HostIntegrationCoreApi { /// Returns the passed map, to test asynchronous serialization and deserialization. Future?> echoAsyncNullableMap( Map? aMap) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableMap'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableMap$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2083,8 +2088,8 @@ class HostIntegrationCoreApi { /// Returns the passed enum, to test asynchronous serialization and deserialization. Future echoAsyncNullableEnum(AnEnum? anEnum) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableEnum'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableEnum$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2109,8 +2114,8 @@ class HostIntegrationCoreApi { } Future callFlutterNoop() async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2133,8 +2138,8 @@ class HostIntegrationCoreApi { } Future callFlutterThrowError() async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowError'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowError$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2157,8 +2162,8 @@ class HostIntegrationCoreApi { } Future callFlutterThrowErrorFromVoid() async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2181,8 +2186,8 @@ class HostIntegrationCoreApi { } Future callFlutterEchoAllTypes(AllTypes everything) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllTypes'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllTypes$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2211,8 +2216,8 @@ class HostIntegrationCoreApi { Future callFlutterEchoAllNullableTypes( AllNullableTypes? everything) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypes'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypes$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2236,8 +2241,8 @@ class HostIntegrationCoreApi { Future callFlutterSendMultipleNullableTypes( bool? aNullableBool, int? aNullableInt, String? aNullableString) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2268,8 +2273,8 @@ class HostIntegrationCoreApi { Future callFlutterEchoAllNullableTypesWithoutRecursion( AllNullableTypesWithoutRecursion? everything) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypesWithoutRecursion'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypesWithoutRecursion$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2294,8 +2299,8 @@ class HostIntegrationCoreApi { Future callFlutterSendMultipleNullableTypesWithoutRecursion(bool? aNullableBool, int? aNullableInt, String? aNullableString) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypesWithoutRecursion'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypesWithoutRecursion$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2324,8 +2329,8 @@ class HostIntegrationCoreApi { } Future callFlutterEchoBool(bool aBool) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoBool'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoBool$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2353,8 +2358,8 @@ class HostIntegrationCoreApi { } Future callFlutterEchoInt(int anInt) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoInt'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoInt$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2382,8 +2387,8 @@ class HostIntegrationCoreApi { } Future callFlutterEchoDouble(double aDouble) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoDouble'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoDouble$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2411,8 +2416,8 @@ class HostIntegrationCoreApi { } Future callFlutterEchoString(String aString) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoString'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoString$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2440,8 +2445,8 @@ class HostIntegrationCoreApi { } Future callFlutterEchoUint8List(Uint8List aList) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoUint8List'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoUint8List$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2469,8 +2474,8 @@ class HostIntegrationCoreApi { } Future> callFlutterEchoList(List aList) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoList'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoList$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2499,8 +2504,8 @@ class HostIntegrationCoreApi { Future> callFlutterEchoMap( Map aMap) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2529,8 +2534,8 @@ class HostIntegrationCoreApi { } Future callFlutterEchoEnum(AnEnum anEnum) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnum'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnum$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2558,8 +2563,8 @@ class HostIntegrationCoreApi { } Future callFlutterEchoNullableBool(bool? aBool) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2582,8 +2587,8 @@ class HostIntegrationCoreApi { } Future callFlutterEchoNullableInt(int? anInt) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2606,8 +2611,8 @@ class HostIntegrationCoreApi { } Future callFlutterEchoNullableDouble(double? aDouble) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2630,8 +2635,8 @@ class HostIntegrationCoreApi { } Future callFlutterEchoNullableString(String? aString) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2654,8 +2659,8 @@ class HostIntegrationCoreApi { } Future callFlutterEchoNullableUint8List(Uint8List? aList) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2679,8 +2684,8 @@ class HostIntegrationCoreApi { Future?> callFlutterEchoNullableList( List? aList) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2704,8 +2709,8 @@ class HostIntegrationCoreApi { Future?> callFlutterEchoNullableMap( Map? aMap) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2729,8 +2734,8 @@ class HostIntegrationCoreApi { } Future callFlutterEchoNullableEnum(AnEnum? anEnum) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnum'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnum$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -2753,6 +2758,35 @@ class HostIntegrationCoreApi { : AnEnum.values[__pigeon_replyList[0]! as int]; } } + + Future callFlutterSmallApiEchoString(String aString) async { + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSmallApiEchoString$__pigeon_messageChannelSuffix'; + final BasicMessageChannel __pigeon_channel = + BasicMessageChannel( + __pigeon_channelName, + pigeonChannelCodec, + binaryMessenger: __pigeon_binaryMessenger, + ); + final List? __pigeon_replyList = + await __pigeon_channel.send([aString]) as List?; + if (__pigeon_replyList == null) { + throw _createConnectionError(__pigeon_channelName); + } else if (__pigeon_replyList.length > 1) { + throw PlatformException( + code: __pigeon_replyList[0]! as String, + message: __pigeon_replyList[1] as String?, + details: __pigeon_replyList[2], + ); + } else if (__pigeon_replyList[0] == null) { + throw PlatformException( + code: 'null-error', + message: 'Host platform returned null value for non-null return value.', + ); + } else { + return (__pigeon_replyList[0] as String?)!; + } + } } class _FlutterIntegrationCoreApiCodec extends StandardMessageCodec { @@ -2891,12 +2925,17 @@ abstract class FlutterIntegrationCoreApi { /// Returns the passed in generic Object asynchronously. Future echoAsyncString(String aString); - static void setup(FlutterIntegrationCoreApi? api, - {BinaryMessenger? binaryMessenger}) { + static void setUp( + FlutterIntegrationCoreApi? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2918,7 +2957,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2940,7 +2979,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwErrorFromVoid', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwErrorFromVoid$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2962,7 +3001,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -2990,7 +3029,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3018,7 +3057,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3047,7 +3086,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypesWithoutRecursion', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypesWithoutRecursion$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3075,7 +3114,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3105,7 +3144,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3133,7 +3172,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3161,7 +3200,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3189,7 +3228,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3217,7 +3256,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3245,7 +3284,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3274,7 +3313,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3303,7 +3342,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnum', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnum$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3332,7 +3371,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3358,7 +3397,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3384,7 +3423,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3410,7 +3449,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3436,7 +3475,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableUint8List', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableUint8List$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3462,7 +3501,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3489,7 +3528,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3516,7 +3555,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnum', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnum$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3543,7 +3582,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3565,7 +3604,7 @@ abstract class FlutterIntegrationCoreApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3598,16 +3637,21 @@ class HostTrivialApi { /// Constructor for [HostTrivialApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - HostTrivialApi({BinaryMessenger? binaryMessenger}) - : __pigeon_binaryMessenger = binaryMessenger; + HostTrivialApi( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : __pigeon_binaryMessenger = binaryMessenger, + __pigeon_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? __pigeon_binaryMessenger; static const MessageCodec pigeonChannelCodec = StandardMessageCodec(); + final String __pigeon_messageChannelSuffix; + Future noop() async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -3635,16 +3679,21 @@ class HostSmallApi { /// Constructor for [HostSmallApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - HostSmallApi({BinaryMessenger? binaryMessenger}) - : __pigeon_binaryMessenger = binaryMessenger; + HostSmallApi( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : __pigeon_binaryMessenger = binaryMessenger, + __pigeon_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? __pigeon_binaryMessenger; static const MessageCodec pigeonChannelCodec = StandardMessageCodec(); + final String __pigeon_messageChannelSuffix; + Future echo(String aString) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -3672,8 +3721,8 @@ class HostSmallApi { } Future voidVoid() async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -3728,11 +3777,17 @@ abstract class FlutterSmallApi { String echoString(String aString); - static void setup(FlutterSmallApi? api, {BinaryMessenger? binaryMessenger}) { + static void setUp( + FlutterSmallApi? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -3760,7 +3815,7 @@ abstract class FlutterSmallApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString', + 'dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart index c585d3a83259..374f272c3583 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart @@ -96,16 +96,21 @@ class EnumApi2Host { /// Constructor for [EnumApi2Host]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - EnumApi2Host({BinaryMessenger? binaryMessenger}) - : __pigeon_binaryMessenger = binaryMessenger; + EnumApi2Host( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : __pigeon_binaryMessenger = binaryMessenger, + __pigeon_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? __pigeon_binaryMessenger; static const MessageCodec pigeonChannelCodec = _EnumApi2HostCodec(); + final String __pigeon_messageChannelSuffix; + /// This comment is to test method documentation comments. Future echo(DataWithEnum data) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.EnumApi2Host.echo'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.EnumApi2Host.echo$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -164,11 +169,17 @@ abstract class EnumApi2Flutter { /// This comment is to test method documentation comments. DataWithEnum echo(DataWithEnum data); - static void setup(EnumApi2Flutter? api, {BinaryMessenger? binaryMessenger}) { + static void setUp( + EnumApi2Flutter? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.EnumApi2Flutter.echo', + 'dev.flutter.pigeon.pigeon_integration_tests.EnumApi2Flutter.echo$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/flutter_unittests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/flutter_unittests.gen.dart index 73f100cf28b6..b37dffb25579 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/flutter_unittests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/flutter_unittests.gen.dart @@ -150,15 +150,19 @@ class Api { /// Constructor for [Api]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - Api({BinaryMessenger? binaryMessenger}) - : __pigeon_binaryMessenger = binaryMessenger; + Api({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : __pigeon_binaryMessenger = binaryMessenger, + __pigeon_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? __pigeon_binaryMessenger; static const MessageCodec pigeonChannelCodec = _ApiCodec(); + final String __pigeon_messageChannelSuffix; + Future search(FlutterSearchRequest request) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.Api.search'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.Api.search$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -186,8 +190,8 @@ class Api { } Future doSearches(FlutterSearchRequests request) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.Api.doSearches'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.Api.doSearches$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -215,8 +219,8 @@ class Api { } Future echo(FlutterSearchRequests requests) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.Api.echo'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.Api.echo$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -244,8 +248,8 @@ class Api { } Future anInt(int value) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.Api.anInt'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.Api.anInt$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart index cc7b8b53c360..044b792995e0 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart @@ -179,18 +179,23 @@ class MessageApi { /// Constructor for [MessageApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - MessageApi({BinaryMessenger? binaryMessenger}) - : __pigeon_binaryMessenger = binaryMessenger; + MessageApi( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : __pigeon_binaryMessenger = binaryMessenger, + __pigeon_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? __pigeon_binaryMessenger; static const MessageCodec pigeonChannelCodec = _MessageApiCodec(); + final String __pigeon_messageChannelSuffix; + /// This comment is to test documentation comments. /// /// This comment also tests multiple line comments. Future initialize() async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.MessageApi.initialize'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.MessageApi.initialize$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -214,8 +219,8 @@ class MessageApi { /// This comment is to test method documentation comments. Future search(MessageSearchRequest request) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.MessageApi.search'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.MessageApi.search$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -281,19 +286,24 @@ class MessageNestedApi { /// Constructor for [MessageNestedApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - MessageNestedApi({BinaryMessenger? binaryMessenger}) - : __pigeon_binaryMessenger = binaryMessenger; + MessageNestedApi( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : __pigeon_binaryMessenger = binaryMessenger, + __pigeon_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? __pigeon_binaryMessenger; static const MessageCodec pigeonChannelCodec = _MessageNestedApiCodec(); + final String __pigeon_messageChannelSuffix; + /// This comment is to test method documentation comments. /// /// This comment also tests multiple line comments. Future search(MessageNested nested) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.MessageNestedApi.search'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.MessageNestedApi.search$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -357,12 +367,17 @@ abstract class MessageFlutterSearchApi { /// This comment is to test method documentation comments. MessageSearchReply search(MessageSearchRequest request); - static void setup(MessageFlutterSearchApi? api, - {BinaryMessenger? binaryMessenger}) { + static void setUp( + MessageFlutterSearchApi? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.MessageFlutterSearchApi.search', + 'dev.flutter.pigeon.pigeon_integration_tests.MessageFlutterSearchApi.search$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart index bec054b4be49..61bd5d140942 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart @@ -34,16 +34,21 @@ class MultipleArityHostApi { /// Constructor for [MultipleArityHostApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - MultipleArityHostApi({BinaryMessenger? binaryMessenger}) - : __pigeon_binaryMessenger = binaryMessenger; + MultipleArityHostApi( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : __pigeon_binaryMessenger = binaryMessenger, + __pigeon_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? __pigeon_binaryMessenger; static const MessageCodec pigeonChannelCodec = StandardMessageCodec(); + final String __pigeon_messageChannelSuffix; + Future subtract(int x, int y) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.MultipleArityHostApi.subtract'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.MultipleArityHostApi.subtract$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -77,12 +82,17 @@ abstract class MultipleArityFlutterApi { int subtract(int x, int y); - static void setup(MultipleArityFlutterApi? api, - {BinaryMessenger? binaryMessenger}) { + static void setUp( + MultipleArityFlutterApi? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.MultipleArityFlutterApi.subtract', + 'dev.flutter.pigeon.pigeon_integration_tests.MultipleArityFlutterApi.subtract$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart index 7279e85c40ea..dcfe61bb0ade 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart @@ -160,17 +160,22 @@ class NonNullFieldHostApi { /// Constructor for [NonNullFieldHostApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - NonNullFieldHostApi({BinaryMessenger? binaryMessenger}) - : __pigeon_binaryMessenger = binaryMessenger; + NonNullFieldHostApi( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : __pigeon_binaryMessenger = binaryMessenger, + __pigeon_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? __pigeon_binaryMessenger; static const MessageCodec pigeonChannelCodec = _NonNullFieldHostApiCodec(); + final String __pigeon_messageChannelSuffix; + Future search( NonNullFieldSearchRequest nested) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.NonNullFieldHostApi.search'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.NonNullFieldHostApi.search$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -237,12 +242,17 @@ abstract class NonNullFieldFlutterApi { NonNullFieldSearchReply search(NonNullFieldSearchRequest request); - static void setup(NonNullFieldFlutterApi? api, - {BinaryMessenger? binaryMessenger}) { + static void setUp( + NonNullFieldFlutterApi? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.NonNullFieldFlutterApi.search', + 'dev.flutter.pigeon.pigeon_integration_tests.NonNullFieldFlutterApi.search$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart index ecf7c7f7e970..940dd315b489 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart @@ -138,16 +138,21 @@ class NullFieldsHostApi { /// Constructor for [NullFieldsHostApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - NullFieldsHostApi({BinaryMessenger? binaryMessenger}) - : __pigeon_binaryMessenger = binaryMessenger; + NullFieldsHostApi( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : __pigeon_binaryMessenger = binaryMessenger, + __pigeon_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? __pigeon_binaryMessenger; static const MessageCodec pigeonChannelCodec = _NullFieldsHostApiCodec(); + final String __pigeon_messageChannelSuffix; + Future search(NullFieldsSearchRequest nested) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.NullFieldsHostApi.search'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.NullFieldsHostApi.search$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -209,12 +214,17 @@ abstract class NullFieldsFlutterApi { NullFieldsSearchReply search(NullFieldsSearchRequest request); - static void setup(NullFieldsFlutterApi? api, - {BinaryMessenger? binaryMessenger}) { + static void setUp( + NullFieldsFlutterApi? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.NullFieldsFlutterApi.search', + 'dev.flutter.pigeon.pigeon_integration_tests.NullFieldsFlutterApi.search$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart index dd1665a463c1..39348701f18d 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart @@ -34,16 +34,21 @@ class NullableReturnHostApi { /// Constructor for [NullableReturnHostApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - NullableReturnHostApi({BinaryMessenger? binaryMessenger}) - : __pigeon_binaryMessenger = binaryMessenger; + NullableReturnHostApi( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : __pigeon_binaryMessenger = binaryMessenger, + __pigeon_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? __pigeon_binaryMessenger; static const MessageCodec pigeonChannelCodec = StandardMessageCodec(); + final String __pigeon_messageChannelSuffix; + Future doit() async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.NullableReturnHostApi.doit'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.NullableReturnHostApi.doit$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -72,12 +77,17 @@ abstract class NullableReturnFlutterApi { int? doit(); - static void setup(NullableReturnFlutterApi? api, - {BinaryMessenger? binaryMessenger}) { + static void setUp( + NullableReturnFlutterApi? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.NullableReturnFlutterApi.doit', + 'dev.flutter.pigeon.pigeon_integration_tests.NullableReturnFlutterApi.doit$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -103,16 +113,21 @@ class NullableArgHostApi { /// Constructor for [NullableArgHostApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - NullableArgHostApi({BinaryMessenger? binaryMessenger}) - : __pigeon_binaryMessenger = binaryMessenger; + NullableArgHostApi( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : __pigeon_binaryMessenger = binaryMessenger, + __pigeon_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? __pigeon_binaryMessenger; static const MessageCodec pigeonChannelCodec = StandardMessageCodec(); + final String __pigeon_messageChannelSuffix; + Future doit(int? x) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.NullableArgHostApi.doit'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.NullableArgHostApi.doit$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -146,12 +161,17 @@ abstract class NullableArgFlutterApi { int? doit(int? x); - static void setup(NullableArgFlutterApi? api, - {BinaryMessenger? binaryMessenger}) { + static void setUp( + NullableArgFlutterApi? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.NullableArgFlutterApi.doit', + 'dev.flutter.pigeon.pigeon_integration_tests.NullableArgFlutterApi.doit$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -181,16 +201,21 @@ class NullableCollectionReturnHostApi { /// Constructor for [NullableCollectionReturnHostApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - NullableCollectionReturnHostApi({BinaryMessenger? binaryMessenger}) - : __pigeon_binaryMessenger = binaryMessenger; + NullableCollectionReturnHostApi( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : __pigeon_binaryMessenger = binaryMessenger, + __pigeon_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? __pigeon_binaryMessenger; static const MessageCodec pigeonChannelCodec = StandardMessageCodec(); + final String __pigeon_messageChannelSuffix; + Future?> doit() async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.NullableCollectionReturnHostApi.doit'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.NullableCollectionReturnHostApi.doit$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -219,12 +244,17 @@ abstract class NullableCollectionReturnFlutterApi { List? doit(); - static void setup(NullableCollectionReturnFlutterApi? api, - {BinaryMessenger? binaryMessenger}) { + static void setUp( + NullableCollectionReturnFlutterApi? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.NullableCollectionReturnFlutterApi.doit', + 'dev.flutter.pigeon.pigeon_integration_tests.NullableCollectionReturnFlutterApi.doit$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -250,16 +280,21 @@ class NullableCollectionArgHostApi { /// Constructor for [NullableCollectionArgHostApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - NullableCollectionArgHostApi({BinaryMessenger? binaryMessenger}) - : __pigeon_binaryMessenger = binaryMessenger; + NullableCollectionArgHostApi( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : __pigeon_binaryMessenger = binaryMessenger, + __pigeon_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? __pigeon_binaryMessenger; static const MessageCodec pigeonChannelCodec = StandardMessageCodec(); + final String __pigeon_messageChannelSuffix; + Future> doit(List? x) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.NullableCollectionArgHostApi.doit'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.NullableCollectionArgHostApi.doit$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -293,12 +328,17 @@ abstract class NullableCollectionArgFlutterApi { List doit(List? x); - static void setup(NullableCollectionArgFlutterApi? api, - {BinaryMessenger? binaryMessenger}) { + static void setUp( + NullableCollectionArgFlutterApi? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.NullableCollectionArgFlutterApi.doit', + 'dev.flutter.pigeon.pigeon_integration_tests.NullableCollectionArgFlutterApi.doit$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart index 72c115d65278..846d67e60993 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart @@ -34,16 +34,21 @@ class PrimitiveHostApi { /// Constructor for [PrimitiveHostApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - PrimitiveHostApi({BinaryMessenger? binaryMessenger}) - : __pigeon_binaryMessenger = binaryMessenger; + PrimitiveHostApi( + {BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) + : __pigeon_binaryMessenger = binaryMessenger, + __pigeon_messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; final BinaryMessenger? __pigeon_binaryMessenger; static const MessageCodec pigeonChannelCodec = StandardMessageCodec(); + final String __pigeon_messageChannelSuffix; + Future anInt(int value) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.anInt'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.anInt$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -71,8 +76,8 @@ class PrimitiveHostApi { } Future aBool(bool value) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aBool'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aBool$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -100,8 +105,8 @@ class PrimitiveHostApi { } Future aString(String value) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aString'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aString$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -129,8 +134,8 @@ class PrimitiveHostApi { } Future aDouble(double value) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aDouble'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aDouble$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -158,8 +163,8 @@ class PrimitiveHostApi { } Future> aMap(Map value) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aMap'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aMap$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -187,8 +192,8 @@ class PrimitiveHostApi { } Future> aList(List value) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aList'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aList$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -216,8 +221,8 @@ class PrimitiveHostApi { } Future anInt32List(Int32List value) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.anInt32List'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.anInt32List$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -245,8 +250,8 @@ class PrimitiveHostApi { } Future> aBoolList(List value) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aBoolList'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aBoolList$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -274,8 +279,8 @@ class PrimitiveHostApi { } Future> aStringIntMap(Map value) async { - const String __pigeon_channelName = - 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aStringIntMap'; + final String __pigeon_channelName = + 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveHostApi.aStringIntMap$__pigeon_messageChannelSuffix'; final BasicMessageChannel __pigeon_channel = BasicMessageChannel( __pigeon_channelName, @@ -326,12 +331,17 @@ abstract class PrimitiveFlutterApi { Map aStringIntMap(Map value); - static void setup(PrimitiveFlutterApi? api, - {BinaryMessenger? binaryMessenger}) { + static void setUp( + PrimitiveFlutterApi? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = + messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.anInt', + 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.anInt$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -359,7 +369,7 @@ abstract class PrimitiveFlutterApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aBool', + 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aBool$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -387,7 +397,7 @@ abstract class PrimitiveFlutterApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aString', + 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aString$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -415,7 +425,7 @@ abstract class PrimitiveFlutterApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aDouble', + 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aDouble$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -443,7 +453,7 @@ abstract class PrimitiveFlutterApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aMap', + 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aMap$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -472,7 +482,7 @@ abstract class PrimitiveFlutterApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aList', + 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aList$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -500,7 +510,7 @@ abstract class PrimitiveFlutterApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.anInt32List', + 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.anInt32List$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -528,7 +538,7 @@ abstract class PrimitiveFlutterApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aBoolList', + 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aBoolList$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { @@ -557,7 +567,7 @@ abstract class PrimitiveFlutterApi { { final BasicMessageChannel __pigeon_channel = BasicMessageChannel< Object?>( - 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aStringIntMap', + 'dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aStringIntMap$messageChannelSuffix', pigeonChannelCodec, binaryMessenger: binaryMessenger); if (api == null) { diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/test/null_safe_test.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/test/null_safe_test.dart index 966c8ac99b3c..0514371264ce 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/test/null_safe_test.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/test/null_safe_test.dart @@ -135,7 +135,7 @@ void main() { MockNullableArgFlutterApi(); when(mockFlutterApi.doit(null)).thenReturn(14); - NullableArgFlutterApi.setup(mockFlutterApi); + NullableArgFlutterApi.setUp(mockFlutterApi); final Completer resultCompleter = Completer(); binding.defaultBinaryMessenger.handlePlatformMessage( @@ -153,7 +153,7 @@ void main() { expect(resultCompleter.future, completion(14)); // Removes message handlers from global default binary messenger. - NullableArgFlutterApi.setup(null); + NullableArgFlutterApi.setUp(null); }); test('receive null collection parameters', () { @@ -161,7 +161,7 @@ void main() { MockNullableCollectionArgFlutterApi(); when(mockFlutterApi.doit(null)).thenReturn(['14']); - NullableCollectionArgFlutterApi.setup(mockFlutterApi); + NullableCollectionArgFlutterApi.setUp(mockFlutterApi); final Completer> resultCompleter = Completer>(); binding.defaultBinaryMessenger.handlePlatformMessage( @@ -181,7 +181,7 @@ void main() { expect(resultCompleter.future, completion(['14'])); // Removes message handlers from global default binary messenger. - NullableArgFlutterApi.setup(null); + NullableArgFlutterApi.setUp(null); }); test('receive null return', () async { @@ -217,7 +217,7 @@ void main() { MockNullableReturnFlutterApi(); when(mockFlutterApi.doit()).thenReturn(null); - NullableReturnFlutterApi.setup(mockFlutterApi); + NullableReturnFlutterApi.setUp(mockFlutterApi); final Completer resultCompleter = Completer(); unawaited(binding.defaultBinaryMessenger.handlePlatformMessage( @@ -231,7 +231,7 @@ void main() { expect(resultCompleter.future, completion(null)); // Removes message handlers from global default binary messenger. - NullableArgFlutterApi.setup(null); + NullableArgFlutterApi.setUp(null); }); test('send null collection return', () async { @@ -239,7 +239,7 @@ void main() { MockNullableCollectionReturnFlutterApi(); when(mockFlutterApi.doit()).thenReturn(null); - NullableCollectionReturnFlutterApi.setup(mockFlutterApi); + NullableCollectionReturnFlutterApi.setUp(mockFlutterApi); final Completer?> resultCompleter = Completer?>(); @@ -255,6 +255,6 @@ void main() { expect(resultCompleter.future, completion(null)); // Removes message handlers from global default binary messenger. - NullableArgFlutterApi.setup(null); + NullableArgFlutterApi.setUp(null); }); } diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/test/primitive_test.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/test/primitive_test.dart index 3623ee1f5e64..7adf512ec5f5 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/test/primitive_test.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/test/primitive_test.dart @@ -53,7 +53,7 @@ void main() { [true, false] ])); }); - PrimitiveFlutterApi.setup(api, binaryMessenger: mockMessenger); + PrimitiveFlutterApi.setUp(api, binaryMessenger: mockMessenger); verify(api.aBoolList([true, false])); }); diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt index 002c621784a8..2d462d760ccb 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt +++ b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt @@ -624,6 +624,8 @@ interface HostIntegrationCoreApi { fun callFlutterEchoNullableEnum(anEnum: AnEnum?, callback: (Result) -> Unit) + fun callFlutterSmallApiEchoString(aString: String, callback: (Result) -> Unit) + companion object { /** The codec used by HostIntegrationCoreApi. */ val codec: MessageCodec by lazy { HostIntegrationCoreApiCodec } @@ -632,12 +634,18 @@ interface HostIntegrationCoreApi { * `binaryMessenger`. */ @Suppress("UNCHECKED_CAST") - fun setUp(binaryMessenger: BinaryMessenger, api: HostIntegrationCoreApi?) { + fun setUp( + binaryMessenger: BinaryMessenger, + api: HostIntegrationCoreApi?, + messageChannelSuffix: String = "" + ) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" run { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> @@ -658,7 +666,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -680,7 +688,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> @@ -700,7 +708,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwErrorFromVoid", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwErrorFromVoid$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> @@ -721,7 +729,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwFlutterError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwFlutterError$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> @@ -741,7 +749,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -763,7 +771,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -785,7 +793,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -807,7 +815,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -829,7 +837,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -851,7 +859,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -873,7 +881,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -895,7 +903,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -917,7 +925,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassWrapper", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassWrapper$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -939,7 +947,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoEnum", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoEnum$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -961,7 +969,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedDefaultString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedDefaultString$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -983,7 +991,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalDefaultDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalDefaultDouble$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1005,7 +1013,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoRequiredInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoRequiredInt$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1027,7 +1035,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypes$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1049,7 +1057,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypesWithoutRecursion$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1071,7 +1079,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.extractNestedNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.extractNestedNullableString$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1093,7 +1101,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.createNestedNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.createNestedNullableString$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1115,7 +1123,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypes$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1142,7 +1150,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1169,7 +1177,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1191,7 +1199,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableDouble$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1213,7 +1221,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableBool$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1235,7 +1243,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableString$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1257,7 +1265,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableUint8List$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1279,7 +1287,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableObject", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableObject$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1301,7 +1309,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableList$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1323,7 +1331,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1345,7 +1353,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnum", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnum$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1367,7 +1375,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalNullableInt$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1389,7 +1397,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedNullableString$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1411,7 +1419,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> @@ -1432,7 +1440,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1456,7 +1464,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1480,7 +1488,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1504,7 +1512,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1528,7 +1536,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncUint8List$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1552,7 +1560,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1576,7 +1584,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1600,7 +1608,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1624,7 +1632,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncEnum", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncEnum$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1648,7 +1656,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> @@ -1670,7 +1678,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncErrorFromVoid", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncErrorFromVoid$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> @@ -1691,7 +1699,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncFlutterError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncFlutterError$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> @@ -1713,7 +1721,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncAllTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncAllTypes$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1737,7 +1745,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1762,7 +1770,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypesWithoutRecursion$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1787,7 +1795,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableInt$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1811,7 +1819,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableDouble$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1835,7 +1843,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableBool$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1859,7 +1867,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableString$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1883,7 +1891,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableUint8List$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1907,7 +1915,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableObject", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableObject$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1931,7 +1939,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableList$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1955,7 +1963,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableMap$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -1979,7 +1987,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableEnum", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableEnum$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2003,7 +2011,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> @@ -2024,7 +2032,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowError$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> @@ -2046,7 +2054,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> @@ -2067,7 +2075,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllTypes$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2091,7 +2099,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypes$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2116,7 +2124,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2144,7 +2152,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypesWithoutRecursion$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2169,7 +2177,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypesWithoutRecursion$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2197,7 +2205,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoBool$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2221,7 +2229,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoInt$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2245,7 +2253,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoDouble$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2269,7 +2277,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoString$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2293,7 +2301,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoUint8List$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2317,7 +2325,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoList$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2341,7 +2349,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2365,7 +2373,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnum", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnum$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2389,7 +2397,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2413,7 +2421,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2437,7 +2445,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2461,7 +2469,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2485,7 +2493,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2509,7 +2517,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2533,7 +2541,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2557,7 +2565,7 @@ interface HostIntegrationCoreApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnum", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnum$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -2577,6 +2585,30 @@ interface HostIntegrationCoreApi { channel.setMessageHandler(null) } } + run { + val channel = + BasicMessageChannel( + binaryMessenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSmallApiEchoString$separatedMessageChannelSuffix", + codec) + if (api != null) { + channel.setMessageHandler { message, reply -> + val args = message as List + val aStringArg = args[0] as String + api.callFlutterSmallApiEchoString(aStringArg) { result: Result -> + val error = result.exceptionOrNull() + if (error != null) { + reply.reply(wrapError(error)) + } else { + val data = result.getOrNull() + reply.reply(wrapResult(data)) + } + } + } + } else { + channel.setMessageHandler(null) + } + } } } } @@ -2640,14 +2672,20 @@ private object FlutterIntegrationCoreApiCodec : StandardMessageCodec() { * Generated class from Pigeon that represents Flutter messages that can be called from Kotlin. */ @Suppress("UNCHECKED_CAST") -class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { +class FlutterIntegrationCoreApi( + private val binaryMessenger: BinaryMessenger, + private val messageChannelSuffix: String = "" +) { companion object { /** The codec used by FlutterIntegrationCoreApi. */ val codec: MessageCodec by lazy { FlutterIntegrationCoreApiCodec } } /** A no-op function taking no arguments and returning no value, to sanity test basic calling. */ fun noop(callback: (Result) -> Unit) { - val channelName = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop" + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" + val channelName = + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(null) { if (it is List<*>) { @@ -2663,8 +2701,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Responds with an error from an async function returning a value. */ fun throwError(callback: (Result) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(null) { if (it is List<*>) { @@ -2681,8 +2721,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Responds with an error from an async void function. */ fun throwErrorFromVoid(callback: (Result) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwErrorFromVoid" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwErrorFromVoid$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(null) { if (it is List<*>) { @@ -2698,8 +2740,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed object, to test serialization and deserialization. */ fun echoAllTypes(everythingArg: AllTypes, callback: (Result) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(everythingArg)) { if (it is List<*>) { @@ -2726,8 +2770,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { everythingArg: AllNullableTypes?, callback: (Result) -> Unit ) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(everythingArg)) { if (it is List<*>) { @@ -2753,8 +2799,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { aNullableStringArg: String?, callback: (Result) -> Unit ) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(aNullableBoolArg, aNullableIntArg, aNullableStringArg)) { if (it is List<*>) { @@ -2781,8 +2829,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { everythingArg: AllNullableTypesWithoutRecursion?, callback: (Result) -> Unit ) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypesWithoutRecursion" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypesWithoutRecursion$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(everythingArg)) { if (it is List<*>) { @@ -2808,8 +2858,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { aNullableStringArg: String?, callback: (Result) -> Unit ) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(aNullableBoolArg, aNullableIntArg, aNullableStringArg)) { if (it is List<*>) { @@ -2833,8 +2885,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed boolean, to test serialization and deserialization. */ fun echoBool(aBoolArg: Boolean, callback: (Result) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(aBoolArg)) { if (it is List<*>) { @@ -2858,8 +2912,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed int, to test serialization and deserialization. */ fun echoInt(anIntArg: Long, callback: (Result) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(anIntArg)) { if (it is List<*>) { @@ -2883,8 +2939,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed double, to test serialization and deserialization. */ fun echoDouble(aDoubleArg: Double, callback: (Result) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(aDoubleArg)) { if (it is List<*>) { @@ -2908,8 +2966,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed string, to test serialization and deserialization. */ fun echoString(aStringArg: String, callback: (Result) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(aStringArg)) { if (it is List<*>) { @@ -2933,8 +2993,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed byte list, to test serialization and deserialization. */ fun echoUint8List(aListArg: ByteArray, callback: (Result) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(aListArg)) { if (it is List<*>) { @@ -2958,8 +3020,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed list, to test serialization and deserialization. */ fun echoList(aListArg: List, callback: (Result>) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(aListArg)) { if (it is List<*>) { @@ -2983,8 +3047,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed map, to test serialization and deserialization. */ fun echoMap(aMapArg: Map, callback: (Result>) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(aMapArg)) { if (it is List<*>) { @@ -3008,8 +3074,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed enum to test serialization and deserialization. */ fun echoEnum(anEnumArg: AnEnum, callback: (Result) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnum" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnum$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(anEnumArg.raw)) { if (it is List<*>) { @@ -3033,8 +3101,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed boolean, to test serialization and deserialization. */ fun echoNullableBool(aBoolArg: Boolean?, callback: (Result) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(aBoolArg)) { if (it is List<*>) { @@ -3051,8 +3121,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed int, to test serialization and deserialization. */ fun echoNullableInt(anIntArg: Long?, callback: (Result) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(anIntArg)) { if (it is List<*>) { @@ -3069,8 +3141,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed double, to test serialization and deserialization. */ fun echoNullableDouble(aDoubleArg: Double?, callback: (Result) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(aDoubleArg)) { if (it is List<*>) { @@ -3087,8 +3161,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed string, to test serialization and deserialization. */ fun echoNullableString(aStringArg: String?, callback: (Result) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(aStringArg)) { if (it is List<*>) { @@ -3105,8 +3181,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed byte list, to test serialization and deserialization. */ fun echoNullableUint8List(aListArg: ByteArray?, callback: (Result) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableUint8List" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableUint8List$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(aListArg)) { if (it is List<*>) { @@ -3123,8 +3201,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed list, to test serialization and deserialization. */ fun echoNullableList(aListArg: List?, callback: (Result?>) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(aListArg)) { if (it is List<*>) { @@ -3144,8 +3224,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { aMapArg: Map?, callback: (Result?>) -> Unit ) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(aMapArg)) { if (it is List<*>) { @@ -3162,8 +3244,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed enum to test serialization and deserialization. */ fun echoNullableEnum(anEnumArg: AnEnum?, callback: (Result) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnum" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnum$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(anEnumArg?.raw)) { if (it is List<*>) { @@ -3183,8 +3267,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { * calling. */ fun noopAsync(callback: (Result) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(null) { if (it is List<*>) { @@ -3200,8 +3286,10 @@ class FlutterIntegrationCoreApi(private val binaryMessenger: BinaryMessenger) { } /** Returns the passed in generic Object asynchronously. */ fun echoAsyncString(aStringArg: String, callback: (Result) -> Unit) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" val channelName = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(aStringArg)) { if (it is List<*>) { @@ -3237,12 +3325,18 @@ interface HostTrivialApi { val codec: MessageCodec by lazy { StandardMessageCodec() } /** Sets up an instance of `HostTrivialApi` to handle messages through the `binaryMessenger`. */ @Suppress("UNCHECKED_CAST") - fun setUp(binaryMessenger: BinaryMessenger, api: HostTrivialApi?) { + fun setUp( + binaryMessenger: BinaryMessenger, + api: HostTrivialApi?, + messageChannelSuffix: String = "" + ) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" run { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop", + "dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> @@ -3277,12 +3371,18 @@ interface HostSmallApi { val codec: MessageCodec by lazy { StandardMessageCodec() } /** Sets up an instance of `HostSmallApi` to handle messages through the `binaryMessenger`. */ @Suppress("UNCHECKED_CAST") - fun setUp(binaryMessenger: BinaryMessenger, api: HostSmallApi?) { + fun setUp( + binaryMessenger: BinaryMessenger, + api: HostSmallApi?, + messageChannelSuffix: String = "" + ) { + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" run { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo", + "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { message, reply -> @@ -3306,7 +3406,7 @@ interface HostSmallApi { val channel = BasicMessageChannel( binaryMessenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid", + "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid$separatedMessageChannelSuffix", codec) if (api != null) { channel.setMessageHandler { _, reply -> @@ -3355,14 +3455,20 @@ private object FlutterSmallApiCodec : StandardMessageCodec() { * Generated class from Pigeon that represents Flutter messages that can be called from Kotlin. */ @Suppress("UNCHECKED_CAST") -class FlutterSmallApi(private val binaryMessenger: BinaryMessenger) { +class FlutterSmallApi( + private val binaryMessenger: BinaryMessenger, + private val messageChannelSuffix: String = "" +) { companion object { /** The codec used by FlutterSmallApi. */ val codec: MessageCodec by lazy { FlutterSmallApiCodec } } fun echoWrappedList(msgArg: TestMessage, callback: (Result) -> Unit) { - val channelName = "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList" + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" + val channelName = + "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(msgArg)) { if (it is List<*>) { @@ -3386,7 +3492,10 @@ class FlutterSmallApi(private val binaryMessenger: BinaryMessenger) { } fun echoString(aStringArg: String, callback: (Result) -> Unit) { - val channelName = "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString" + val separatedMessageChannelSuffix = + if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else "" + val channelName = + "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString$separatedMessageChannelSuffix" val channel = BasicMessageChannel(binaryMessenger, channelName, codec) channel.send(listOf(aStringArg)) { if (it is List<*>) { diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/TestPlugin.kt b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/TestPlugin.kt index c64aab7d34f5..8453a1cae2c3 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/TestPlugin.kt +++ b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/TestPlugin.kt @@ -5,14 +5,23 @@ package com.example.test_plugin import io.flutter.embedding.engine.plugins.FlutterPlugin +import io.flutter.embedding.engine.plugins.FlutterPlugin.FlutterPluginBinding /** This plugin handles the native side of the integration tests in example/integration_test/. */ class TestPlugin : FlutterPlugin, HostIntegrationCoreApi { - var flutterApi: FlutterIntegrationCoreApi? = null + private var flutterApi: FlutterIntegrationCoreApi? = null + private var flutterSmallApiOne: FlutterSmallApi? = null + private var flutterSmallApiTwo: FlutterSmallApi? = null override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) { HostIntegrationCoreApi.setUp(binding.binaryMessenger, this) + val testSuffixApiOne: TestPluginWithSuffix = TestPluginWithSuffix() + testSuffixApiOne.setUp(binding, "suffixOne") + val testSuffixApiTwo: TestPluginWithSuffix = TestPluginWithSuffix() + testSuffixApiTwo.setUp(binding, "suffixTwo") flutterApi = FlutterIntegrationCoreApi(binding.binaryMessenger) + flutterSmallApiOne = FlutterSmallApi(binding.binaryMessenger, "suffixOne") + flutterSmallApiTwo = FlutterSmallApi(binding.binaryMessenger, "suffixTwo") } override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {} @@ -422,4 +431,33 @@ class TestPlugin : FlutterPlugin, HostIntegrationCoreApi { override fun callFlutterEchoNullableEnum(anEnum: AnEnum?, callback: (Result) -> Unit) { flutterApi!!.echoNullableEnum(anEnum) { echo -> callback(echo) } } + + override fun callFlutterSmallApiEchoString(aString: String, callback: (Result) -> Unit) { + flutterSmallApiOne!!.echoString(aString) { echoOne -> + flutterSmallApiTwo!!.echoString(aString) { echoTwo -> + if (echoOne == echoTwo) { + callback(echoTwo) + } else { + callback( + Result.failure( + Exception("Multi-instance responses were not matching: $echoOne, $echoTwo"))) + } + } + } + } +} + +class TestPluginWithSuffix : HostSmallApi { + + fun setUp(binding: FlutterPluginBinding, suffix: String) { + HostSmallApi.setUp(binding.binaryMessenger, this, suffix) + } + + override fun echo(aString: String, callback: (Result) -> Unit) { + callback(Result.success(aString)) + } + + override fun voidVoid(callback: (Result) -> Unit) { + callback(Result.success(Unit)) + } } diff --git a/packages/pigeon/platform_tests/test_plugin/example/ios/Runner.xcodeproj/project.pbxproj b/packages/pigeon/platform_tests/test_plugin/example/ios/Runner.xcodeproj/project.pbxproj index e7f0a6902fd8..c0ccf06b3f23 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/pigeon/platform_tests/test_plugin/example/ios/Runner.xcodeproj/project.pbxproj @@ -254,7 +254,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1400; - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 33A341B4291ECCA100D34E0F = { diff --git a/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/RunnerTests.swift b/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/RunnerTests.swift index 9ad4dd95c0ca..e86e5c948d10 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/RunnerTests.swift +++ b/packages/pigeon/platform_tests/test_plugin/example/ios/RunnerTests/RunnerTests.swift @@ -36,7 +36,7 @@ class RunnerTests: XCTestCase { func testEchoStringFromProtocol() throws { let api: FlutterApiFromProtocol = FlutterApiFromProtocol() let aString = "aString" - api.echo(aString) { response in + api.echo(string: aString) { response in switch response { case .success(let res): XCTAssertEqual(aString, res) @@ -48,7 +48,8 @@ class RunnerTests: XCTestCase { } class FlutterApiFromProtocol: FlutterSmallApiProtocol { - func echo(_ aStringArg: String, completion: @escaping (Result) -> Void) { + func echo(string aStringArg: String, completion: @escaping (Result) -> Void) + { completion(.success(aStringArg)) } diff --git a/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift b/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift index 3a45a12a40fe..f02daf701672 100644 --- a/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift +++ b/packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift @@ -646,6 +646,8 @@ protocol HostIntegrationCoreApi { _ aMap: [String?: Any?]?, completion: @escaping (Result<[String?: Any?]?, Error>) -> Void) func callFlutterNullableEcho( _ anEnum: AnEnum?, completion: @escaping (Result) -> Void) + func callFlutterSmallApiEcho( + _ aString: String, completion: @escaping (Result) -> Void) } /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. @@ -653,11 +655,16 @@ class HostIntegrationCoreApiSetup { /// The codec used by HostIntegrationCoreApi. static var codec: FlutterStandardMessageCodec { HostIntegrationCoreApiCodec.shared } /// Sets up an instance of `HostIntegrationCoreApi` to handle messages through the `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: HostIntegrationCoreApi?) { + static func setUp( + binaryMessenger: FlutterBinaryMessenger, api: HostIntegrationCoreApi?, + messageChannelSuffix: String = "" + ) { + let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" /// A no-op function taking no arguments and returning no value, to sanity /// test basic calling. let noopChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { noopChannel.setMessageHandler { _, reply in @@ -673,7 +680,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed object, to test serialization and deserialization. let echoAllTypesChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAllTypesChannel.setMessageHandler { message, reply in @@ -691,7 +699,8 @@ class HostIntegrationCoreApiSetup { } /// Returns an error, to test error handling. let throwErrorChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwErrorChannel.setMessageHandler { _, reply in @@ -707,7 +716,8 @@ class HostIntegrationCoreApiSetup { } /// Returns an error from a void function, to test error handling. let throwErrorFromVoidChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwErrorFromVoid", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwErrorFromVoid\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwErrorFromVoidChannel.setMessageHandler { _, reply in @@ -723,7 +733,8 @@ class HostIntegrationCoreApiSetup { } /// Returns a Flutter error, to test error handling. let throwFlutterErrorChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwFlutterError", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwFlutterError\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwFlutterErrorChannel.setMessageHandler { _, reply in @@ -739,7 +750,8 @@ class HostIntegrationCoreApiSetup { } /// Returns passed in int. let echoIntChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoIntChannel.setMessageHandler { message, reply in @@ -757,7 +769,8 @@ class HostIntegrationCoreApiSetup { } /// Returns passed in double. let echoDoubleChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoDoubleChannel.setMessageHandler { message, reply in @@ -775,7 +788,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in boolean. let echoBoolChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoBoolChannel.setMessageHandler { message, reply in @@ -793,7 +807,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in string. let echoStringChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoStringChannel.setMessageHandler { message, reply in @@ -811,7 +826,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in Uint8List. let echoUint8ListChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoUint8ListChannel.setMessageHandler { message, reply in @@ -829,7 +845,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in generic Object. let echoObjectChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoObjectChannel.setMessageHandler { message, reply in @@ -847,7 +864,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed list, to test serialization and deserialization. let echoListChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoListChannel.setMessageHandler { message, reply in @@ -865,7 +883,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed map, to test serialization and deserialization. let echoMapChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoMapChannel.setMessageHandler { message, reply in @@ -883,7 +902,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed map to test nested class serialization and deserialization. let echoClassWrapperChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassWrapper", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassWrapper\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoClassWrapperChannel.setMessageHandler { message, reply in @@ -901,7 +921,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed enum to test serialization and deserialization. let echoEnumChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoEnum", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoEnum\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoEnumChannel.setMessageHandler { message, reply in @@ -920,7 +941,7 @@ class HostIntegrationCoreApiSetup { /// Returns the default string. let echoNamedDefaultStringChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedDefaultString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedDefaultString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNamedDefaultStringChannel.setMessageHandler { message, reply in @@ -939,7 +960,7 @@ class HostIntegrationCoreApiSetup { /// Returns passed in double. let echoOptionalDefaultDoubleChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalDefaultDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalDefaultDouble\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoOptionalDefaultDoubleChannel.setMessageHandler { message, reply in @@ -957,7 +978,8 @@ class HostIntegrationCoreApiSetup { } /// Returns passed in int. let echoRequiredIntChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoRequiredInt", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoRequiredInt\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoRequiredIntChannel.setMessageHandler { message, reply in @@ -976,7 +998,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed object, to test serialization and deserialization. let echoAllNullableTypesChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypes\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAllNullableTypesChannel.setMessageHandler { message, reply in @@ -995,7 +1017,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed object, to test serialization and deserialization. let echoAllNullableTypesWithoutRecursionChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypesWithoutRecursion\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAllNullableTypesWithoutRecursionChannel.setMessageHandler { message, reply in @@ -1015,7 +1037,7 @@ class HostIntegrationCoreApiSetup { /// sending of nested objects. let extractNestedNullableStringChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.extractNestedNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.extractNestedNullableString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { extractNestedNullableStringChannel.setMessageHandler { message, reply in @@ -1035,7 +1057,7 @@ class HostIntegrationCoreApiSetup { /// sending of nested objects. let createNestedNullableStringChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.createNestedNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.createNestedNullableString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { createNestedNullableStringChannel.setMessageHandler { message, reply in @@ -1054,7 +1076,7 @@ class HostIntegrationCoreApiSetup { /// Returns passed in arguments of multiple types. let sendMultipleNullableTypesChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypes\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { sendMultipleNullableTypesChannel.setMessageHandler { message, reply in @@ -1078,7 +1100,7 @@ class HostIntegrationCoreApiSetup { /// Returns passed in arguments of multiple types. let sendMultipleNullableTypesWithoutRecursionChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { sendMultipleNullableTypesWithoutRecursionChannel.setMessageHandler { message, reply in @@ -1101,7 +1123,8 @@ class HostIntegrationCoreApiSetup { } /// Returns passed in int. let echoNullableIntChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableIntChannel.setMessageHandler { message, reply in @@ -1121,7 +1144,8 @@ class HostIntegrationCoreApiSetup { } /// Returns passed in double. let echoNullableDoubleChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableDouble", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableDouble\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableDoubleChannel.setMessageHandler { message, reply in @@ -1139,7 +1163,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in boolean. let echoNullableBoolChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableBool", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableBool\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableBoolChannel.setMessageHandler { message, reply in @@ -1157,7 +1182,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in string. let echoNullableStringChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableString", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableStringChannel.setMessageHandler { message, reply in @@ -1176,7 +1202,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed in Uint8List. let echoNullableUint8ListChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableUint8List\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableUint8ListChannel.setMessageHandler { message, reply in @@ -1194,7 +1220,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in generic Object. let echoNullableObjectChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableObject", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableObject\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableObjectChannel.setMessageHandler { message, reply in @@ -1212,7 +1239,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed list, to test serialization and deserialization. let echoNullableListChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableList", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableList\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableListChannel.setMessageHandler { message, reply in @@ -1230,7 +1258,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed map, to test serialization and deserialization. let echoNullableMapChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableMapChannel.setMessageHandler { message, reply in @@ -1247,7 +1276,8 @@ class HostIntegrationCoreApiSetup { echoNullableMapChannel.setMessageHandler(nil) } let echoNullableEnumChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnum", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnum\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableEnumChannel.setMessageHandler { message, reply in @@ -1266,7 +1296,7 @@ class HostIntegrationCoreApiSetup { /// Returns passed in int. let echoOptionalNullableIntChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalNullableInt\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoOptionalNullableIntChannel.setMessageHandler { message, reply in @@ -1287,7 +1317,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed in string. let echoNamedNullableStringChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedNullableString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNamedNullableStringChannel.setMessageHandler { message, reply in @@ -1306,7 +1336,8 @@ class HostIntegrationCoreApiSetup { /// A no-op function taking no arguments and returning no value, to sanity /// test basic asynchronous calling. let noopAsyncChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { noopAsyncChannel.setMessageHandler { _, reply in @@ -1324,7 +1355,8 @@ class HostIntegrationCoreApiSetup { } /// Returns passed in int asynchronously. let echoAsyncIntChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncIntChannel.setMessageHandler { message, reply in @@ -1344,7 +1376,8 @@ class HostIntegrationCoreApiSetup { } /// Returns passed in double asynchronously. let echoAsyncDoubleChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncDoubleChannel.setMessageHandler { message, reply in @@ -1364,7 +1397,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in boolean asynchronously. let echoAsyncBoolChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncBoolChannel.setMessageHandler { message, reply in @@ -1384,7 +1418,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed string asynchronously. let echoAsyncStringChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncStringChannel.setMessageHandler { message, reply in @@ -1404,7 +1439,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in Uint8List asynchronously. let echoAsyncUint8ListChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncUint8List", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncUint8List\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncUint8ListChannel.setMessageHandler { message, reply in @@ -1424,7 +1460,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in generic Object asynchronously. let echoAsyncObjectChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncObjectChannel.setMessageHandler { message, reply in @@ -1444,7 +1481,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed list, to test asynchronous serialization and deserialization. let echoAsyncListChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncListChannel.setMessageHandler { message, reply in @@ -1464,7 +1502,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed map, to test asynchronous serialization and deserialization. let echoAsyncMapChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncMapChannel.setMessageHandler { message, reply in @@ -1484,7 +1523,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed enum, to test asynchronous serialization and deserialization. let echoAsyncEnumChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncEnum", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncEnum\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncEnumChannel.setMessageHandler { message, reply in @@ -1504,7 +1544,8 @@ class HostIntegrationCoreApiSetup { } /// Responds with an error from an async function returning a value. let throwAsyncErrorChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwAsyncErrorChannel.setMessageHandler { _, reply in @@ -1523,7 +1564,7 @@ class HostIntegrationCoreApiSetup { /// Responds with an error from an async void function. let throwAsyncErrorFromVoidChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncErrorFromVoid", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncErrorFromVoid\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwAsyncErrorFromVoidChannel.setMessageHandler { _, reply in @@ -1542,7 +1583,7 @@ class HostIntegrationCoreApiSetup { /// Responds with a Flutter error from an async function returning a value. let throwAsyncFlutterErrorChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncFlutterError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncFlutterError\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwAsyncFlutterErrorChannel.setMessageHandler { _, reply in @@ -1560,7 +1601,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed object, to test async serialization and deserialization. let echoAsyncAllTypesChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncAllTypes", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncAllTypes\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncAllTypesChannel.setMessageHandler { message, reply in @@ -1581,7 +1623,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed object, to test serialization and deserialization. let echoAsyncNullableAllNullableTypesChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableAllNullableTypesChannel.setMessageHandler { message, reply in @@ -1602,7 +1644,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed object, to test serialization and deserialization. let echoAsyncNullableAllNullableTypesWithoutRecursionChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypesWithoutRecursion\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableAllNullableTypesWithoutRecursionChannel.setMessageHandler { message, reply in @@ -1623,7 +1665,7 @@ class HostIntegrationCoreApiSetup { /// Returns passed in int asynchronously. let echoAsyncNullableIntChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableInt\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableIntChannel.setMessageHandler { message, reply in @@ -1646,7 +1688,7 @@ class HostIntegrationCoreApiSetup { /// Returns passed in double asynchronously. let echoAsyncNullableDoubleChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableDouble\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableDoubleChannel.setMessageHandler { message, reply in @@ -1667,7 +1709,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed in boolean asynchronously. let echoAsyncNullableBoolChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableBool\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableBoolChannel.setMessageHandler { message, reply in @@ -1688,7 +1730,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed string asynchronously. let echoAsyncNullableStringChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableStringChannel.setMessageHandler { message, reply in @@ -1709,7 +1751,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed in Uint8List asynchronously. let echoAsyncNullableUint8ListChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableUint8List\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableUint8ListChannel.setMessageHandler { message, reply in @@ -1730,7 +1772,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed in generic Object asynchronously. let echoAsyncNullableObjectChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableObject", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableObject\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableObjectChannel.setMessageHandler { message, reply in @@ -1751,7 +1793,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed list, to test asynchronous serialization and deserialization. let echoAsyncNullableListChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableList\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableListChannel.setMessageHandler { message, reply in @@ -1772,7 +1814,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed map, to test asynchronous serialization and deserialization. let echoAsyncNullableMapChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableMap\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableMapChannel.setMessageHandler { message, reply in @@ -1793,7 +1835,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed enum, to test asynchronous serialization and deserialization. let echoAsyncNullableEnumChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableEnum", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableEnum\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableEnumChannel.setMessageHandler { message, reply in @@ -1812,7 +1854,8 @@ class HostIntegrationCoreApiSetup { echoAsyncNullableEnumChannel.setMessageHandler(nil) } let callFlutterNoopChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterNoopChannel.setMessageHandler { _, reply in @@ -1830,7 +1873,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterThrowErrorChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowError\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterThrowErrorChannel.setMessageHandler { _, reply in @@ -1848,7 +1891,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterThrowErrorFromVoidChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterThrowErrorFromVoidChannel.setMessageHandler { _, reply in @@ -1866,7 +1909,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoAllTypesChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllTypes\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoAllTypesChannel.setMessageHandler { message, reply in @@ -1886,7 +1929,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoAllNullableTypesChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypes\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoAllNullableTypesChannel.setMessageHandler { message, reply in @@ -1906,7 +1949,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterSendMultipleNullableTypesChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterSendMultipleNullableTypesChannel.setMessageHandler { message, reply in @@ -1932,7 +1975,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoAllNullableTypesWithoutRecursionChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypesWithoutRecursion\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoAllNullableTypesWithoutRecursionChannel.setMessageHandler { message, reply in @@ -1952,7 +1995,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterSendMultipleNullableTypesWithoutRecursionChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypesWithoutRecursion\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterSendMultipleNullableTypesWithoutRecursionChannel.setMessageHandler { @@ -1979,7 +2022,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoBoolChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoBool\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoBoolChannel.setMessageHandler { message, reply in @@ -1998,7 +2041,8 @@ class HostIntegrationCoreApiSetup { callFlutterEchoBoolChannel.setMessageHandler(nil) } let callFlutterEchoIntChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoInt", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoInt\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoIntChannel.setMessageHandler { message, reply in @@ -2018,7 +2062,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoDoubleChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoDouble\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoDoubleChannel.setMessageHandler { message, reply in @@ -2038,7 +2082,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoStringChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoStringChannel.setMessageHandler { message, reply in @@ -2058,7 +2102,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoUint8ListChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoUint8List\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoUint8ListChannel.setMessageHandler { message, reply in @@ -2078,7 +2122,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoListChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoList\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoListChannel.setMessageHandler { message, reply in @@ -2097,7 +2141,8 @@ class HostIntegrationCoreApiSetup { callFlutterEchoListChannel.setMessageHandler(nil) } let callFlutterEchoMapChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoMapChannel.setMessageHandler { message, reply in @@ -2117,7 +2162,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoEnumChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnum", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnum\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoEnumChannel.setMessageHandler { message, reply in @@ -2137,7 +2182,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoNullableBoolChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableBoolChannel.setMessageHandler { message, reply in @@ -2157,7 +2202,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoNullableIntChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableIntChannel.setMessageHandler { message, reply in @@ -2179,7 +2224,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoNullableDoubleChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableDoubleChannel.setMessageHandler { message, reply in @@ -2199,7 +2244,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoNullableStringChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableStringChannel.setMessageHandler { message, reply in @@ -2219,7 +2264,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoNullableUint8ListChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableUint8ListChannel.setMessageHandler { message, reply in @@ -2239,7 +2284,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoNullableListChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableListChannel.setMessageHandler { message, reply in @@ -2259,7 +2304,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoNullableMapChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableMapChannel.setMessageHandler { message, reply in @@ -2279,7 +2324,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoNullableEnumChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnum", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnum\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableEnumChannel.setMessageHandler { message, reply in @@ -2297,6 +2342,26 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoNullableEnumChannel.setMessageHandler(nil) } + let callFlutterSmallApiEchoStringChannel = FlutterBasicMessageChannel( + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSmallApiEchoString\(channelSuffix)", + binaryMessenger: binaryMessenger, codec: codec) + if let api = api { + callFlutterSmallApiEchoStringChannel.setMessageHandler { message, reply in + let args = message as! [Any?] + let aStringArg = args[0] as! String + api.callFlutterSmallApiEcho(aStringArg) { result in + switch result { + case .success(let res): + reply(wrapResult(res)) + case .failure(let error): + reply(wrapError(error)) + } + } + } + } else { + callFlutterSmallApiEchoStringChannel.setMessageHandler(nil) + } } } private class FlutterIntegrationCoreApiCodecReader: FlutterStandardReader { @@ -2446,8 +2511,10 @@ protocol FlutterIntegrationCoreApiProtocol { } class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { private let binaryMessenger: FlutterBinaryMessenger - init(binaryMessenger: FlutterBinaryMessenger) { + private let messageChannelSuffix: String + init(binaryMessenger: FlutterBinaryMessenger, messageChannelSuffix: String = "") { self.binaryMessenger = binaryMessenger + self.messageChannelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" } var codec: FlutterStandardMessageCodec { return FlutterIntegrationCoreApiCodec.shared @@ -2456,7 +2523,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// test basic calling. func noop(completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage(nil) { response in @@ -2477,7 +2544,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// Responds with an error from an async function returning a value. func throwError(completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage(nil) { response in @@ -2499,7 +2566,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// Responds with an error from an async void function. func throwErrorFromVoid(completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwErrorFromVoid" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwErrorFromVoid\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage(nil) { response in @@ -2522,7 +2589,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { _ everythingArg: AllTypes, completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([everythingArg] as [Any?]) { response in @@ -2553,7 +2620,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([everythingArg] as [Any?]) { response in @@ -2581,7 +2648,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aNullableBoolArg, aNullableIntArg, aNullableStringArg] as [Any?]) { @@ -2613,7 +2680,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypesWithoutRecursion" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypesWithoutRecursion\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([everythingArg] as [Any?]) { response in @@ -2641,7 +2708,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aNullableBoolArg, aNullableIntArg, aNullableStringArg] as [Any?]) { @@ -2670,7 +2737,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// Returns the passed boolean, to test serialization and deserialization. func echo(_ aBoolArg: Bool, completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aBoolArg] as [Any?]) { response in @@ -2698,7 +2765,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// Returns the passed int, to test serialization and deserialization. func echo(_ anIntArg: Int64, completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([anIntArg] as [Any?]) { response in @@ -2727,7 +2794,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// Returns the passed double, to test serialization and deserialization. func echo(_ aDoubleArg: Double, completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aDoubleArg] as [Any?]) { response in @@ -2755,7 +2822,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// Returns the passed string, to test serialization and deserialization. func echo(_ aStringArg: String, completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aStringArg] as [Any?]) { response in @@ -2786,7 +2853,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aListArg] as [Any?]) { response in @@ -2814,7 +2881,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// Returns the passed list, to test serialization and deserialization. func echo(_ aListArg: [Any?], completion: @escaping (Result<[Any?], FlutterError>) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aListArg] as [Any?]) { response in @@ -2845,7 +2912,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { completion: @escaping (Result<[String?: Any?], FlutterError>) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aMapArg] as [Any?]) { response in @@ -2873,7 +2940,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// Returns the passed enum to test serialization and deserialization. func echo(_ anEnumArg: AnEnum, completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnum" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnum\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([anEnumArg.rawValue] as [Any?]) { response in @@ -2902,7 +2969,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { func echoNullable(_ aBoolArg: Bool?, completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aBoolArg] as [Any?]) { response in @@ -2926,7 +2993,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { _ anIntArg: Int64?, completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([anIntArg] as [Any?]) { response in @@ -2954,7 +3021,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { _ aDoubleArg: Double?, completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aDoubleArg] as [Any?]) { response in @@ -2978,7 +3045,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { _ aStringArg: String?, completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aStringArg] as [Any?]) { response in @@ -3003,7 +3070,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableUint8List" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableUint8List\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aListArg] as [Any?]) { response in @@ -3027,7 +3094,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { _ aListArg: [Any?]?, completion: @escaping (Result<[Any?]?, FlutterError>) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aListArg] as [Any?]) { response in @@ -3052,7 +3119,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { completion: @escaping (Result<[String?: Any?]?, FlutterError>) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aMapArg] as [Any?]) { response in @@ -3076,7 +3143,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { _ anEnumArg: AnEnum?, completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnum" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnum\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([anEnumArg?.rawValue] as [Any?]) { response in @@ -3100,7 +3167,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// test basic asynchronous calling. func noopAsync(completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage(nil) { response in @@ -3122,7 +3189,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { func echoAsync(_ aStringArg: String, completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aStringArg] as [Any?]) { response in @@ -3159,9 +3226,12 @@ protocol HostTrivialApi { class HostTrivialApiSetup { /// The codec used by HostTrivialApi. /// Sets up an instance of `HostTrivialApi` to handle messages through the `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: HostTrivialApi?) { + static func setUp( + binaryMessenger: FlutterBinaryMessenger, api: HostTrivialApi?, messageChannelSuffix: String = "" + ) { + let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let noopChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop", + name: "dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop\(channelSuffix)", binaryMessenger: binaryMessenger) if let api = api { noopChannel.setMessageHandler { _, reply in @@ -3189,9 +3259,12 @@ protocol HostSmallApi { class HostSmallApiSetup { /// The codec used by HostSmallApi. /// Sets up an instance of `HostSmallApi` to handle messages through the `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: HostSmallApi?) { + static func setUp( + binaryMessenger: FlutterBinaryMessenger, api: HostSmallApi?, messageChannelSuffix: String = "" + ) { + let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let echoChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo", + name: "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo\(channelSuffix)", binaryMessenger: binaryMessenger) if let api = api { echoChannel.setMessageHandler { message, reply in @@ -3210,7 +3283,7 @@ class HostSmallApiSetup { echoChannel.setMessageHandler(nil) } let voidVoidChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid", + name: "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid\(channelSuffix)", binaryMessenger: binaryMessenger) if let api = api { voidVoidChannel.setMessageHandler { _, reply in @@ -3270,12 +3343,14 @@ class FlutterSmallApiCodec: FlutterStandardMessageCodec { protocol FlutterSmallApiProtocol { func echo( _ msgArg: TestMessage, completion: @escaping (Result) -> Void) - func echo(_ aStringArg: String, completion: @escaping (Result) -> Void) + func echo(string aStringArg: String, completion: @escaping (Result) -> Void) } class FlutterSmallApi: FlutterSmallApiProtocol { private let binaryMessenger: FlutterBinaryMessenger - init(binaryMessenger: FlutterBinaryMessenger) { + private let messageChannelSuffix: String + init(binaryMessenger: FlutterBinaryMessenger, messageChannelSuffix: String = "") { self.binaryMessenger = binaryMessenger + self.messageChannelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" } var codec: FlutterStandardMessageCodec { return FlutterSmallApiCodec.shared @@ -3284,7 +3359,7 @@ class FlutterSmallApi: FlutterSmallApiProtocol { _ msgArg: TestMessage, completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([msgArg] as [Any?]) { response in @@ -3309,9 +3384,10 @@ class FlutterSmallApi: FlutterSmallApiProtocol { } } } - func echo(_ aStringArg: String, completion: @escaping (Result) -> Void) { + func echo(string aStringArg: String, completion: @escaping (Result) -> Void) + { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aStringArg] as [Any?]) { response in diff --git a/packages/pigeon/platform_tests/test_plugin/ios/Classes/TestPlugin.swift b/packages/pigeon/platform_tests/test_plugin/ios/Classes/TestPlugin.swift index d444e5c0bacc..dd88abb5a2a9 100644 --- a/packages/pigeon/platform_tests/test_plugin/ios/Classes/TestPlugin.swift +++ b/packages/pigeon/platform_tests/test_plugin/ios/Classes/TestPlugin.swift @@ -12,14 +12,22 @@ extension FlutterError: Error {} public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi { var flutterAPI: FlutterIntegrationCoreApi + var flutterSmallApiOne: FlutterSmallApi + var flutterSmallApiTwo: FlutterSmallApi public static func register(with registrar: FlutterPluginRegistrar) { let plugin = TestPlugin(binaryMessenger: registrar.messenger()) HostIntegrationCoreApiSetup.setUp(binaryMessenger: registrar.messenger(), api: plugin) + TestPluginWithSuffix.register(with: registrar, suffix: "suffixOne") + TestPluginWithSuffix.register(with: registrar, suffix: "suffixTwo") } init(binaryMessenger: FlutterBinaryMessenger) { flutterAPI = FlutterIntegrationCoreApi(binaryMessenger: binaryMessenger) + flutterSmallApiOne = FlutterSmallApi( + binaryMessenger: binaryMessenger, messageChannelSuffix: "suffixOne") + flutterSmallApiTwo = FlutterSmallApi( + binaryMessenger: binaryMessenger, messageChannelSuffix: "suffixTwo") } // MARK: HostIntegrationCoreApi implementation @@ -600,4 +608,50 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi { } } } + + func callFlutterSmallApiEcho( + _ aString: String, completion: @escaping (Result) -> Void + ) { + flutterSmallApiOne.echo(string: aString) { responseOne in + self.flutterSmallApiTwo.echo(string: aString) { responseTwo in + switch responseOne { + case .success(let resOne): + switch responseTwo { + case .success(let resTwo): + if resOne == resTwo { + completion(.success(resOne)) + } else { + completion( + .failure( + FlutterError( + code: "", + message: "Multi-instance responses were not matching: \(resOne), \(resTwo)", + details: nil))) + } + case .failure(let error): + completion(.failure(error)) + } + case .failure(let error): + completion(.failure(error)) + } + } + } + } +} + +public class TestPluginWithSuffix: HostSmallApi { + public static func register(with registrar: FlutterPluginRegistrar, suffix: String) { + let plugin = TestPluginWithSuffix() + HostSmallApiSetup.setUp( + binaryMessenger: registrar.messenger(), api: plugin, messageChannelSuffix: suffix) + } + + func echo(aString: String, completion: @escaping (Result) -> Void) { + completion(.success(aString)) + } + + func voidVoid(completion: @escaping (Result) -> Void) { + completion(.success(Void())) + } + } diff --git a/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift b/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift index 3a45a12a40fe..f02daf701672 100644 --- a/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift +++ b/packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift @@ -646,6 +646,8 @@ protocol HostIntegrationCoreApi { _ aMap: [String?: Any?]?, completion: @escaping (Result<[String?: Any?]?, Error>) -> Void) func callFlutterNullableEcho( _ anEnum: AnEnum?, completion: @escaping (Result) -> Void) + func callFlutterSmallApiEcho( + _ aString: String, completion: @escaping (Result) -> Void) } /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. @@ -653,11 +655,16 @@ class HostIntegrationCoreApiSetup { /// The codec used by HostIntegrationCoreApi. static var codec: FlutterStandardMessageCodec { HostIntegrationCoreApiCodec.shared } /// Sets up an instance of `HostIntegrationCoreApi` to handle messages through the `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: HostIntegrationCoreApi?) { + static func setUp( + binaryMessenger: FlutterBinaryMessenger, api: HostIntegrationCoreApi?, + messageChannelSuffix: String = "" + ) { + let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" /// A no-op function taking no arguments and returning no value, to sanity /// test basic calling. let noopChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noop\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { noopChannel.setMessageHandler { _, reply in @@ -673,7 +680,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed object, to test serialization and deserialization. let echoAllTypesChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllTypes\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAllTypesChannel.setMessageHandler { message, reply in @@ -691,7 +699,8 @@ class HostIntegrationCoreApiSetup { } /// Returns an error, to test error handling. let throwErrorChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwError\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwErrorChannel.setMessageHandler { _, reply in @@ -707,7 +716,8 @@ class HostIntegrationCoreApiSetup { } /// Returns an error from a void function, to test error handling. let throwErrorFromVoidChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwErrorFromVoid", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwErrorFromVoid\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwErrorFromVoidChannel.setMessageHandler { _, reply in @@ -723,7 +733,8 @@ class HostIntegrationCoreApiSetup { } /// Returns a Flutter error, to test error handling. let throwFlutterErrorChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwFlutterError", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwFlutterError\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwFlutterErrorChannel.setMessageHandler { _, reply in @@ -739,7 +750,8 @@ class HostIntegrationCoreApiSetup { } /// Returns passed in int. let echoIntChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoInt\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoIntChannel.setMessageHandler { message, reply in @@ -757,7 +769,8 @@ class HostIntegrationCoreApiSetup { } /// Returns passed in double. let echoDoubleChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoDouble\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoDoubleChannel.setMessageHandler { message, reply in @@ -775,7 +788,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in boolean. let echoBoolChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoBool\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoBoolChannel.setMessageHandler { message, reply in @@ -793,7 +807,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in string. let echoStringChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoStringChannel.setMessageHandler { message, reply in @@ -811,7 +826,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in Uint8List. let echoUint8ListChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoUint8List\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoUint8ListChannel.setMessageHandler { message, reply in @@ -829,7 +845,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in generic Object. let echoObjectChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoObject\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoObjectChannel.setMessageHandler { message, reply in @@ -847,7 +864,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed list, to test serialization and deserialization. let echoListChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoList\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoListChannel.setMessageHandler { message, reply in @@ -865,7 +883,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed map, to test serialization and deserialization. let echoMapChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoMap\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoMapChannel.setMessageHandler { message, reply in @@ -883,7 +902,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed map to test nested class serialization and deserialization. let echoClassWrapperChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassWrapper", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoClassWrapper\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoClassWrapperChannel.setMessageHandler { message, reply in @@ -901,7 +921,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed enum to test serialization and deserialization. let echoEnumChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoEnum", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoEnum\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoEnumChannel.setMessageHandler { message, reply in @@ -920,7 +941,7 @@ class HostIntegrationCoreApiSetup { /// Returns the default string. let echoNamedDefaultStringChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedDefaultString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedDefaultString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNamedDefaultStringChannel.setMessageHandler { message, reply in @@ -939,7 +960,7 @@ class HostIntegrationCoreApiSetup { /// Returns passed in double. let echoOptionalDefaultDoubleChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalDefaultDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalDefaultDouble\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoOptionalDefaultDoubleChannel.setMessageHandler { message, reply in @@ -957,7 +978,8 @@ class HostIntegrationCoreApiSetup { } /// Returns passed in int. let echoRequiredIntChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoRequiredInt", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoRequiredInt\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoRequiredIntChannel.setMessageHandler { message, reply in @@ -976,7 +998,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed object, to test serialization and deserialization. let echoAllNullableTypesChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypes\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAllNullableTypesChannel.setMessageHandler { message, reply in @@ -995,7 +1017,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed object, to test serialization and deserialization. let echoAllNullableTypesWithoutRecursionChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAllNullableTypesWithoutRecursion\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAllNullableTypesWithoutRecursionChannel.setMessageHandler { message, reply in @@ -1015,7 +1037,7 @@ class HostIntegrationCoreApiSetup { /// sending of nested objects. let extractNestedNullableStringChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.extractNestedNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.extractNestedNullableString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { extractNestedNullableStringChannel.setMessageHandler { message, reply in @@ -1035,7 +1057,7 @@ class HostIntegrationCoreApiSetup { /// sending of nested objects. let createNestedNullableStringChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.createNestedNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.createNestedNullableString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { createNestedNullableStringChannel.setMessageHandler { message, reply in @@ -1054,7 +1076,7 @@ class HostIntegrationCoreApiSetup { /// Returns passed in arguments of multiple types. let sendMultipleNullableTypesChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypes\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { sendMultipleNullableTypesChannel.setMessageHandler { message, reply in @@ -1078,7 +1100,7 @@ class HostIntegrationCoreApiSetup { /// Returns passed in arguments of multiple types. let sendMultipleNullableTypesWithoutRecursionChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { sendMultipleNullableTypesWithoutRecursionChannel.setMessageHandler { message, reply in @@ -1101,7 +1123,8 @@ class HostIntegrationCoreApiSetup { } /// Returns passed in int. let echoNullableIntChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableInt\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableIntChannel.setMessageHandler { message, reply in @@ -1121,7 +1144,8 @@ class HostIntegrationCoreApiSetup { } /// Returns passed in double. let echoNullableDoubleChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableDouble", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableDouble\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableDoubleChannel.setMessageHandler { message, reply in @@ -1139,7 +1163,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in boolean. let echoNullableBoolChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableBool", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableBool\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableBoolChannel.setMessageHandler { message, reply in @@ -1157,7 +1182,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in string. let echoNullableStringChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableString", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableStringChannel.setMessageHandler { message, reply in @@ -1176,7 +1202,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed in Uint8List. let echoNullableUint8ListChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableUint8List\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableUint8ListChannel.setMessageHandler { message, reply in @@ -1194,7 +1220,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in generic Object. let echoNullableObjectChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableObject", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableObject\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableObjectChannel.setMessageHandler { message, reply in @@ -1212,7 +1239,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed list, to test serialization and deserialization. let echoNullableListChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableList", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableList\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableListChannel.setMessageHandler { message, reply in @@ -1230,7 +1258,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed map, to test serialization and deserialization. let echoNullableMapChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableMap\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableMapChannel.setMessageHandler { message, reply in @@ -1247,7 +1276,8 @@ class HostIntegrationCoreApiSetup { echoNullableMapChannel.setMessageHandler(nil) } let echoNullableEnumChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnum", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNullableEnum\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNullableEnumChannel.setMessageHandler { message, reply in @@ -1266,7 +1296,7 @@ class HostIntegrationCoreApiSetup { /// Returns passed in int. let echoOptionalNullableIntChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoOptionalNullableInt\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoOptionalNullableIntChannel.setMessageHandler { message, reply in @@ -1287,7 +1317,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed in string. let echoNamedNullableStringChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoNamedNullableString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoNamedNullableStringChannel.setMessageHandler { message, reply in @@ -1306,7 +1336,8 @@ class HostIntegrationCoreApiSetup { /// A no-op function taking no arguments and returning no value, to sanity /// test basic asynchronous calling. let noopAsyncChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.noopAsync\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { noopAsyncChannel.setMessageHandler { _, reply in @@ -1324,7 +1355,8 @@ class HostIntegrationCoreApiSetup { } /// Returns passed in int asynchronously. let echoAsyncIntChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncInt\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncIntChannel.setMessageHandler { message, reply in @@ -1344,7 +1376,8 @@ class HostIntegrationCoreApiSetup { } /// Returns passed in double asynchronously. let echoAsyncDoubleChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncDouble\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncDoubleChannel.setMessageHandler { message, reply in @@ -1364,7 +1397,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in boolean asynchronously. let echoAsyncBoolChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncBool\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncBoolChannel.setMessageHandler { message, reply in @@ -1384,7 +1418,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed string asynchronously. let echoAsyncStringChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncStringChannel.setMessageHandler { message, reply in @@ -1404,7 +1439,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in Uint8List asynchronously. let echoAsyncUint8ListChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncUint8List", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncUint8List\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncUint8ListChannel.setMessageHandler { message, reply in @@ -1424,7 +1460,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed in generic Object asynchronously. let echoAsyncObjectChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncObject\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncObjectChannel.setMessageHandler { message, reply in @@ -1444,7 +1481,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed list, to test asynchronous serialization and deserialization. let echoAsyncListChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncList\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncListChannel.setMessageHandler { message, reply in @@ -1464,7 +1502,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed map, to test asynchronous serialization and deserialization. let echoAsyncMapChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncMap\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncMapChannel.setMessageHandler { message, reply in @@ -1484,7 +1523,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed enum, to test asynchronous serialization and deserialization. let echoAsyncEnumChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncEnum", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncEnum\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncEnumChannel.setMessageHandler { message, reply in @@ -1504,7 +1544,8 @@ class HostIntegrationCoreApiSetup { } /// Responds with an error from an async function returning a value. let throwAsyncErrorChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncError\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwAsyncErrorChannel.setMessageHandler { _, reply in @@ -1523,7 +1564,7 @@ class HostIntegrationCoreApiSetup { /// Responds with an error from an async void function. let throwAsyncErrorFromVoidChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncErrorFromVoid", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncErrorFromVoid\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwAsyncErrorFromVoidChannel.setMessageHandler { _, reply in @@ -1542,7 +1583,7 @@ class HostIntegrationCoreApiSetup { /// Responds with a Flutter error from an async function returning a value. let throwAsyncFlutterErrorChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncFlutterError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.throwAsyncFlutterError\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { throwAsyncFlutterErrorChannel.setMessageHandler { _, reply in @@ -1560,7 +1601,8 @@ class HostIntegrationCoreApiSetup { } /// Returns the passed object, to test async serialization and deserialization. let echoAsyncAllTypesChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncAllTypes", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncAllTypes\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncAllTypesChannel.setMessageHandler { message, reply in @@ -1581,7 +1623,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed object, to test serialization and deserialization. let echoAsyncNullableAllNullableTypesChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypes\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableAllNullableTypesChannel.setMessageHandler { message, reply in @@ -1602,7 +1644,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed object, to test serialization and deserialization. let echoAsyncNullableAllNullableTypesWithoutRecursionChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableAllNullableTypesWithoutRecursion\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableAllNullableTypesWithoutRecursionChannel.setMessageHandler { message, reply in @@ -1623,7 +1665,7 @@ class HostIntegrationCoreApiSetup { /// Returns passed in int asynchronously. let echoAsyncNullableIntChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableInt\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableIntChannel.setMessageHandler { message, reply in @@ -1646,7 +1688,7 @@ class HostIntegrationCoreApiSetup { /// Returns passed in double asynchronously. let echoAsyncNullableDoubleChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableDouble\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableDoubleChannel.setMessageHandler { message, reply in @@ -1667,7 +1709,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed in boolean asynchronously. let echoAsyncNullableBoolChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableBool\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableBoolChannel.setMessageHandler { message, reply in @@ -1688,7 +1730,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed string asynchronously. let echoAsyncNullableStringChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableStringChannel.setMessageHandler { message, reply in @@ -1709,7 +1751,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed in Uint8List asynchronously. let echoAsyncNullableUint8ListChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableUint8List\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableUint8ListChannel.setMessageHandler { message, reply in @@ -1730,7 +1772,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed in generic Object asynchronously. let echoAsyncNullableObjectChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableObject", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableObject\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableObjectChannel.setMessageHandler { message, reply in @@ -1751,7 +1793,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed list, to test asynchronous serialization and deserialization. let echoAsyncNullableListChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableList\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableListChannel.setMessageHandler { message, reply in @@ -1772,7 +1814,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed map, to test asynchronous serialization and deserialization. let echoAsyncNullableMapChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableMap\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableMapChannel.setMessageHandler { message, reply in @@ -1793,7 +1835,7 @@ class HostIntegrationCoreApiSetup { /// Returns the passed enum, to test asynchronous serialization and deserialization. let echoAsyncNullableEnumChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableEnum", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.echoAsyncNullableEnum\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { echoAsyncNullableEnumChannel.setMessageHandler { message, reply in @@ -1812,7 +1854,8 @@ class HostIntegrationCoreApiSetup { echoAsyncNullableEnumChannel.setMessageHandler(nil) } let callFlutterNoopChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterNoop\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterNoopChannel.setMessageHandler { _, reply in @@ -1830,7 +1873,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterThrowErrorChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowError", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowError\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterThrowErrorChannel.setMessageHandler { _, reply in @@ -1848,7 +1891,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterThrowErrorFromVoidChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterThrowErrorFromVoid\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterThrowErrorFromVoidChannel.setMessageHandler { _, reply in @@ -1866,7 +1909,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoAllTypesChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllTypes\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoAllTypesChannel.setMessageHandler { message, reply in @@ -1886,7 +1929,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoAllNullableTypesChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypes\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoAllNullableTypesChannel.setMessageHandler { message, reply in @@ -1906,7 +1949,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterSendMultipleNullableTypesChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypes\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterSendMultipleNullableTypesChannel.setMessageHandler { message, reply in @@ -1932,7 +1975,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoAllNullableTypesWithoutRecursionChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoAllNullableTypesWithoutRecursion\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoAllNullableTypesWithoutRecursionChannel.setMessageHandler { message, reply in @@ -1952,7 +1995,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterSendMultipleNullableTypesWithoutRecursionChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypesWithoutRecursion", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSendMultipleNullableTypesWithoutRecursion\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterSendMultipleNullableTypesWithoutRecursionChannel.setMessageHandler { @@ -1979,7 +2022,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoBoolChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoBool\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoBoolChannel.setMessageHandler { message, reply in @@ -1998,7 +2041,8 @@ class HostIntegrationCoreApiSetup { callFlutterEchoBoolChannel.setMessageHandler(nil) } let callFlutterEchoIntChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoInt", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoInt\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoIntChannel.setMessageHandler { message, reply in @@ -2018,7 +2062,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoDoubleChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoDouble\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoDoubleChannel.setMessageHandler { message, reply in @@ -2038,7 +2082,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoStringChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoStringChannel.setMessageHandler { message, reply in @@ -2058,7 +2102,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoUint8ListChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoUint8List\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoUint8ListChannel.setMessageHandler { message, reply in @@ -2078,7 +2122,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoListChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoList\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoListChannel.setMessageHandler { message, reply in @@ -2097,7 +2141,8 @@ class HostIntegrationCoreApiSetup { callFlutterEchoListChannel.setMessageHandler(nil) } let callFlutterEchoMapChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap", + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoMap\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoMapChannel.setMessageHandler { message, reply in @@ -2117,7 +2162,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoEnumChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnum", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoEnum\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoEnumChannel.setMessageHandler { message, reply in @@ -2137,7 +2182,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoNullableBoolChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableBool\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableBoolChannel.setMessageHandler { message, reply in @@ -2157,7 +2202,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoNullableIntChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableInt\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableIntChannel.setMessageHandler { message, reply in @@ -2179,7 +2224,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoNullableDoubleChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableDouble\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableDoubleChannel.setMessageHandler { message, reply in @@ -2199,7 +2244,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoNullableStringChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableStringChannel.setMessageHandler { message, reply in @@ -2219,7 +2264,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoNullableUint8ListChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableUint8List\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableUint8ListChannel.setMessageHandler { message, reply in @@ -2239,7 +2284,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoNullableListChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableList\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableListChannel.setMessageHandler { message, reply in @@ -2259,7 +2304,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoNullableMapChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableMap\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableMapChannel.setMessageHandler { message, reply in @@ -2279,7 +2324,7 @@ class HostIntegrationCoreApiSetup { } let callFlutterEchoNullableEnumChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnum", + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterEchoNullableEnum\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec) if let api = api { callFlutterEchoNullableEnumChannel.setMessageHandler { message, reply in @@ -2297,6 +2342,26 @@ class HostIntegrationCoreApiSetup { } else { callFlutterEchoNullableEnumChannel.setMessageHandler(nil) } + let callFlutterSmallApiEchoStringChannel = FlutterBasicMessageChannel( + name: + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi.callFlutterSmallApiEchoString\(channelSuffix)", + binaryMessenger: binaryMessenger, codec: codec) + if let api = api { + callFlutterSmallApiEchoStringChannel.setMessageHandler { message, reply in + let args = message as! [Any?] + let aStringArg = args[0] as! String + api.callFlutterSmallApiEcho(aStringArg) { result in + switch result { + case .success(let res): + reply(wrapResult(res)) + case .failure(let error): + reply(wrapError(error)) + } + } + } + } else { + callFlutterSmallApiEchoStringChannel.setMessageHandler(nil) + } } } private class FlutterIntegrationCoreApiCodecReader: FlutterStandardReader { @@ -2446,8 +2511,10 @@ protocol FlutterIntegrationCoreApiProtocol { } class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { private let binaryMessenger: FlutterBinaryMessenger - init(binaryMessenger: FlutterBinaryMessenger) { + private let messageChannelSuffix: String + init(binaryMessenger: FlutterBinaryMessenger, messageChannelSuffix: String = "") { self.binaryMessenger = binaryMessenger + self.messageChannelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" } var codec: FlutterStandardMessageCodec { return FlutterIntegrationCoreApiCodec.shared @@ -2456,7 +2523,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// test basic calling. func noop(completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noop\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage(nil) { response in @@ -2477,7 +2544,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// Responds with an error from an async function returning a value. func throwError(completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwError\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage(nil) { response in @@ -2499,7 +2566,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// Responds with an error from an async void function. func throwErrorFromVoid(completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwErrorFromVoid" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.throwErrorFromVoid\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage(nil) { response in @@ -2522,7 +2589,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { _ everythingArg: AllTypes, completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([everythingArg] as [Any?]) { response in @@ -2553,7 +2620,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([everythingArg] as [Any?]) { response in @@ -2581,7 +2648,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aNullableBoolArg, aNullableIntArg, aNullableStringArg] as [Any?]) { @@ -2613,7 +2680,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypesWithoutRecursion" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypesWithoutRecursion\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([everythingArg] as [Any?]) { response in @@ -2641,7 +2708,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aNullableBoolArg, aNullableIntArg, aNullableStringArg] as [Any?]) { @@ -2670,7 +2737,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// Returns the passed boolean, to test serialization and deserialization. func echo(_ aBoolArg: Bool, completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aBoolArg] as [Any?]) { response in @@ -2698,7 +2765,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// Returns the passed int, to test serialization and deserialization. func echo(_ anIntArg: Int64, completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([anIntArg] as [Any?]) { response in @@ -2727,7 +2794,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// Returns the passed double, to test serialization and deserialization. func echo(_ aDoubleArg: Double, completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aDoubleArg] as [Any?]) { response in @@ -2755,7 +2822,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// Returns the passed string, to test serialization and deserialization. func echo(_ aStringArg: String, completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aStringArg] as [Any?]) { response in @@ -2786,7 +2853,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aListArg] as [Any?]) { response in @@ -2814,7 +2881,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// Returns the passed list, to test serialization and deserialization. func echo(_ aListArg: [Any?], completion: @escaping (Result<[Any?], FlutterError>) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aListArg] as [Any?]) { response in @@ -2845,7 +2912,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { completion: @escaping (Result<[String?: Any?], FlutterError>) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aMapArg] as [Any?]) { response in @@ -2873,7 +2940,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// Returns the passed enum to test serialization and deserialization. func echo(_ anEnumArg: AnEnum, completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnum" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnum\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([anEnumArg.rawValue] as [Any?]) { response in @@ -2902,7 +2969,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { func echoNullable(_ aBoolArg: Bool?, completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aBoolArg] as [Any?]) { response in @@ -2926,7 +2993,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { _ anIntArg: Int64?, completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([anIntArg] as [Any?]) { response in @@ -2954,7 +3021,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { _ aDoubleArg: Double?, completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aDoubleArg] as [Any?]) { response in @@ -2978,7 +3045,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { _ aStringArg: String?, completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aStringArg] as [Any?]) { response in @@ -3003,7 +3070,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableUint8List" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableUint8List\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aListArg] as [Any?]) { response in @@ -3027,7 +3094,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { _ aListArg: [Any?]?, completion: @escaping (Result<[Any?]?, FlutterError>) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aListArg] as [Any?]) { response in @@ -3052,7 +3119,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { completion: @escaping (Result<[String?: Any?]?, FlutterError>) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aMapArg] as [Any?]) { response in @@ -3076,7 +3143,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { _ anEnumArg: AnEnum?, completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnum" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnum\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([anEnumArg?.rawValue] as [Any?]) { response in @@ -3100,7 +3167,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { /// test basic asynchronous calling. func noopAsync(completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.noopAsync\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage(nil) { response in @@ -3122,7 +3189,7 @@ class FlutterIntegrationCoreApi: FlutterIntegrationCoreApiProtocol { func echoAsync(_ aStringArg: String, completion: @escaping (Result) -> Void) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aStringArg] as [Any?]) { response in @@ -3159,9 +3226,12 @@ protocol HostTrivialApi { class HostTrivialApiSetup { /// The codec used by HostTrivialApi. /// Sets up an instance of `HostTrivialApi` to handle messages through the `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: HostTrivialApi?) { + static func setUp( + binaryMessenger: FlutterBinaryMessenger, api: HostTrivialApi?, messageChannelSuffix: String = "" + ) { + let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let noopChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop", + name: "dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop\(channelSuffix)", binaryMessenger: binaryMessenger) if let api = api { noopChannel.setMessageHandler { _, reply in @@ -3189,9 +3259,12 @@ protocol HostSmallApi { class HostSmallApiSetup { /// The codec used by HostSmallApi. /// Sets up an instance of `HostSmallApi` to handle messages through the `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: HostSmallApi?) { + static func setUp( + binaryMessenger: FlutterBinaryMessenger, api: HostSmallApi?, messageChannelSuffix: String = "" + ) { + let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let echoChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo", + name: "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo\(channelSuffix)", binaryMessenger: binaryMessenger) if let api = api { echoChannel.setMessageHandler { message, reply in @@ -3210,7 +3283,7 @@ class HostSmallApiSetup { echoChannel.setMessageHandler(nil) } let voidVoidChannel = FlutterBasicMessageChannel( - name: "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid", + name: "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid\(channelSuffix)", binaryMessenger: binaryMessenger) if let api = api { voidVoidChannel.setMessageHandler { _, reply in @@ -3270,12 +3343,14 @@ class FlutterSmallApiCodec: FlutterStandardMessageCodec { protocol FlutterSmallApiProtocol { func echo( _ msgArg: TestMessage, completion: @escaping (Result) -> Void) - func echo(_ aStringArg: String, completion: @escaping (Result) -> Void) + func echo(string aStringArg: String, completion: @escaping (Result) -> Void) } class FlutterSmallApi: FlutterSmallApiProtocol { private let binaryMessenger: FlutterBinaryMessenger - init(binaryMessenger: FlutterBinaryMessenger) { + private let messageChannelSuffix: String + init(binaryMessenger: FlutterBinaryMessenger, messageChannelSuffix: String = "") { self.binaryMessenger = binaryMessenger + self.messageChannelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" } var codec: FlutterStandardMessageCodec { return FlutterSmallApiCodec.shared @@ -3284,7 +3359,7 @@ class FlutterSmallApi: FlutterSmallApiProtocol { _ msgArg: TestMessage, completion: @escaping (Result) -> Void ) { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([msgArg] as [Any?]) { response in @@ -3309,9 +3384,10 @@ class FlutterSmallApi: FlutterSmallApiProtocol { } } } - func echo(_ aStringArg: String, completion: @escaping (Result) -> Void) { + func echo(string aStringArg: String, completion: @escaping (Result) -> Void) + { let channelName: String = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString" + "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( name: channelName, binaryMessenger: binaryMessenger, codec: codec) channel.sendMessage([aStringArg] as [Any?]) { response in diff --git a/packages/pigeon/platform_tests/test_plugin/macos/Classes/TestPlugin.swift b/packages/pigeon/platform_tests/test_plugin/macos/Classes/TestPlugin.swift index 019864394650..759b4ac21ac9 100644 --- a/packages/pigeon/platform_tests/test_plugin/macos/Classes/TestPlugin.swift +++ b/packages/pigeon/platform_tests/test_plugin/macos/Classes/TestPlugin.swift @@ -11,14 +11,22 @@ extension FlutterError: Error {} /// example/integration_test/. public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi { var flutterAPI: FlutterIntegrationCoreApi + var flutterSmallApiOne: FlutterSmallApi + var flutterSmallApiTwo: FlutterSmallApi public static func register(with registrar: FlutterPluginRegistrar) { let plugin = TestPlugin(binaryMessenger: registrar.messenger) HostIntegrationCoreApiSetup.setUp(binaryMessenger: registrar.messenger, api: plugin) + TestPluginWithSuffix.register(with: registrar, suffix: "suffixOne") + TestPluginWithSuffix.register(with: registrar, suffix: "suffixTwo") } init(binaryMessenger: FlutterBinaryMessenger) { flutterAPI = FlutterIntegrationCoreApi(binaryMessenger: binaryMessenger) + flutterSmallApiOne = FlutterSmallApi( + binaryMessenger: binaryMessenger, messageChannelSuffix: "suffixOne") + flutterSmallApiTwo = FlutterSmallApi( + binaryMessenger: binaryMessenger, messageChannelSuffix: "suffixTwo") } // MARK: HostIntegrationCoreApi implementation @@ -599,4 +607,50 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi { } } } + + func callFlutterSmallApiEcho( + _ aString: String, completion: @escaping (Result) -> Void + ) { + flutterSmallApiOne.echo(string: aString) { responseOne in + self.flutterSmallApiTwo.echo(string: aString) { responseTwo in + switch responseOne { + case .success(let resOne): + switch responseTwo { + case .success(let resTwo): + if resOne == resTwo { + completion(.success(resOne)) + } else { + completion( + .failure( + FlutterError( + code: "", + message: "Multi-instance responses were not matching: \(resOne), \(resTwo)", + details: nil))) + } + case .failure(let error): + completion(.failure(error)) + } + case .failure(let error): + completion(.failure(error)) + } + } + } + } +} + +public class TestPluginWithSuffix: HostSmallApi { + public static func register(with registrar: FlutterPluginRegistrar, suffix: String) { + let plugin = TestPluginWithSuffix() + HostSmallApiSetup.setUp( + binaryMessenger: registrar.messenger, api: plugin, messageChannelSuffix: suffix) + } + + func echo(aString: String, completion: @escaping (Result) -> Void) { + completion(.success(aString)) + } + + func voidVoid(completion: @escaping (Result) -> Void) { + completion(.success(Void())) + } + } diff --git a/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp b/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp index fd12459454a1..a1cff580e06e 100644 --- a/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp +++ b/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.cpp @@ -1376,10 +1376,21 @@ const flutter::StandardMessageCodec& HostIntegrationCoreApi::GetCodec() { // the `binary_messenger`. void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, HostIntegrationCoreApi* api) { + HostIntegrationCoreApi::SetUp(binary_messenger, api, ""); +} + +void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, + HostIntegrationCoreApi* api, + const std::string& message_channel_suffix) { + const std::string prepended_suffix = + message_channel_suffix.length() > 0 + ? std::string(".") + message_channel_suffix + : ""; { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.noop", + "HostIntegrationCoreApi.noop" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -1405,7 +1416,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoAllTypes", + "HostIntegrationCoreApi.echoAllTypes" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -1440,7 +1452,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.throwError", + "HostIntegrationCoreApi.throwError" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -1472,7 +1485,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.throwErrorFromVoid", + "HostIntegrationCoreApi.throwErrorFromVoid" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -1498,7 +1512,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.throwFlutterError", + "HostIntegrationCoreApi.throwFlutterError" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -1531,7 +1546,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoInt", + "HostIntegrationCoreApi.echoInt" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -1564,7 +1580,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoDouble", + "HostIntegrationCoreApi.echoDouble" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -1598,7 +1615,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoBool", + "HostIntegrationCoreApi.echoBool" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -1631,7 +1649,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoString", + "HostIntegrationCoreApi.echoString" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -1665,7 +1684,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoUint8List", + "HostIntegrationCoreApi.echoUint8List" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -1700,7 +1720,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoObject", + "HostIntegrationCoreApi.echoObject" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -1733,7 +1754,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoList", + "HostIntegrationCoreApi.echoList" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -1767,7 +1789,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoMap", + "HostIntegrationCoreApi.echoMap" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -1801,7 +1824,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoClassWrapper", + "HostIntegrationCoreApi.echoClassWrapper" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -1837,7 +1861,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoEnum", + "HostIntegrationCoreApi.echoEnum" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -1873,7 +1898,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "echoNamedDefaultString", + "echoNamedDefaultString" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -1909,7 +1935,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "echoOptionalDefaultDouble", + "echoOptionalDefaultDouble" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -1944,7 +1971,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoRequiredInt", + "HostIntegrationCoreApi.echoRequiredInt" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -1975,10 +2003,12 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, } } { - BasicMessageChannel<> channel(binary_messenger, - "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoAllNullableTypes", - &GetCodec()); + BasicMessageChannel<> channel( + binary_messenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAllNullableTypes" + + prepended_suffix, + &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( [api](const EncodableValue& message, @@ -2017,7 +2047,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "echoAllNullableTypesWithoutRecursion", + "echoAllNullableTypesWithoutRecursion" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2057,7 +2088,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "extractNestedNullableString", + "extractNestedNullableString" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2099,7 +2131,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "createNestedNullableString", + "createNestedNullableString" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2132,7 +2165,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "sendMultipleNullableTypes", + "sendMultipleNullableTypes" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2178,7 +2212,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "sendMultipleNullableTypesWithoutRecursion", + "sendMultipleNullableTypesWithoutRecursion" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2224,7 +2259,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoNullableInt", + "HostIntegrationCoreApi.echoNullableInt" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2267,7 +2303,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoNullableDouble", + "HostIntegrationCoreApi.echoNullableDouble" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2304,7 +2341,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoNullableBool", + "HostIntegrationCoreApi.echoNullableBool" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2341,7 +2379,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoNullableString", + "HostIntegrationCoreApi.echoNullableString" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2379,7 +2418,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "echoNullableUint8List", + "echoNullableUint8List" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2417,7 +2457,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoNullableObject", + "HostIntegrationCoreApi.echoNullableObject" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2454,7 +2495,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoNullableList", + "HostIntegrationCoreApi.echoNullableList" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2491,7 +2533,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoNullableMap", + "HostIntegrationCoreApi.echoNullableMap" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2528,7 +2571,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoNullableEnum", + "HostIntegrationCoreApi.echoNullableEnum" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2573,7 +2617,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "echoOptionalNullableInt", + "echoOptionalNullableInt" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2617,7 +2662,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "echoNamedNullableString", + "echoNamedNullableString" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2654,7 +2700,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.noopAsync", + "HostIntegrationCoreApi.noopAsync" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2681,7 +2728,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoAsyncInt", + "HostIntegrationCoreApi.echoAsyncInt" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2716,7 +2764,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoAsyncDouble", + "HostIntegrationCoreApi.echoAsyncDouble" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2753,7 +2802,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoAsyncBool", + "HostIntegrationCoreApi.echoAsyncBool" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2788,7 +2838,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoAsyncString", + "HostIntegrationCoreApi.echoAsyncString" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2825,7 +2876,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoAsyncUint8List", + "HostIntegrationCoreApi.echoAsyncUint8List" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2863,7 +2915,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoAsyncObject", + "HostIntegrationCoreApi.echoAsyncObject" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2899,7 +2952,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoAsyncList", + "HostIntegrationCoreApi.echoAsyncList" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2936,7 +2990,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoAsyncMap", + "HostIntegrationCoreApi.echoAsyncMap" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -2973,7 +3028,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoAsyncEnum", + "HostIntegrationCoreApi.echoAsyncEnum" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3010,7 +3066,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.throwAsyncError", + "HostIntegrationCoreApi.throwAsyncError" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3045,7 +3102,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "throwAsyncErrorFromVoid", + "throwAsyncErrorFromVoid" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3074,7 +3132,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "throwAsyncFlutterError", + "throwAsyncFlutterError" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3108,7 +3167,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoAsyncAllTypes", + "HostIntegrationCoreApi.echoAsyncAllTypes" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3146,7 +3206,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "echoAsyncNullableAllNullableTypes", + "echoAsyncNullableAllNullableTypes" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3188,7 +3249,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "echoAsyncNullableAllNullableTypesWithoutRecursion", + "echoAsyncNullableAllNullableTypesWithoutRecursion" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3229,10 +3291,12 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, } } { - BasicMessageChannel<> channel(binary_messenger, - "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoAsyncNullableInt", - &GetCodec()); + BasicMessageChannel<> channel( + binary_messenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncNullableInt" + + prepended_suffix, + &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( [api](const EncodableValue& message, @@ -3275,7 +3339,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "echoAsyncNullableDouble", + "echoAsyncNullableDouble" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3315,7 +3380,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "echoAsyncNullableBool", + "echoAsyncNullableBool" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3353,7 +3419,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "echoAsyncNullableString", + "echoAsyncNullableString" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3393,7 +3460,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "echoAsyncNullableUint8List", + "echoAsyncNullableUint8List" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3434,7 +3502,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "echoAsyncNullableObject", + "echoAsyncNullableObject" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3473,7 +3542,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "echoAsyncNullableList", + "echoAsyncNullableList" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3510,10 +3580,12 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, } } { - BasicMessageChannel<> channel(binary_messenger, - "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.echoAsyncNullableMap", - &GetCodec()); + BasicMessageChannel<> channel( + binary_messenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "echoAsyncNullableMap" + + prepended_suffix, + &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( [api](const EncodableValue& message, @@ -3552,7 +3624,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "echoAsyncNullableEnum", + "echoAsyncNullableEnum" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3598,7 +3671,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.callFlutterNoop", + "HostIntegrationCoreApi.callFlutterNoop" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3627,7 +3701,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "callFlutterThrowError", + "callFlutterThrowError" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3662,7 +3737,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "callFlutterThrowErrorFromVoid", + "callFlutterThrowErrorFromVoid" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3691,7 +3767,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "callFlutterEchoAllTypes", + "callFlutterEchoAllTypes" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3729,7 +3806,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "callFlutterEchoAllNullableTypes", + "callFlutterEchoAllNullableTypes" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3771,7 +3849,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "callFlutterSendMultipleNullableTypes", + "callFlutterSendMultipleNullableTypes" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3819,7 +3898,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "callFlutterEchoAllNullableTypesWithoutRecursion", + "callFlutterEchoAllNullableTypesWithoutRecursion" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3863,7 +3943,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "callFlutterSendMultipleNullableTypesWithoutRecursion", + "callFlutterSendMultipleNullableTypesWithoutRecursion" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3910,7 +3991,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.callFlutterEchoBool", + "HostIntegrationCoreApi.callFlutterEchoBool" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3946,7 +4028,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.callFlutterEchoInt", + "HostIntegrationCoreApi.callFlutterEchoInt" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -3983,7 +4066,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "callFlutterEchoDouble", + "callFlutterEchoDouble" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -4021,7 +4105,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "callFlutterEchoString", + "callFlutterEchoString" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -4059,7 +4144,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "callFlutterEchoUint8List", + "callFlutterEchoUint8List" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -4096,7 +4182,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.callFlutterEchoList", + "HostIntegrationCoreApi.callFlutterEchoList" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -4133,7 +4220,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.callFlutterEchoMap", + "HostIntegrationCoreApi.callFlutterEchoMap" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -4170,7 +4258,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel(binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests." - "HostIntegrationCoreApi.callFlutterEchoEnum", + "HostIntegrationCoreApi.callFlutterEchoEnum" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -4208,7 +4297,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "callFlutterEchoNullableBool", + "callFlutterEchoNullableBool" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -4246,7 +4336,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "callFlutterEchoNullableInt", + "callFlutterEchoNullableInt" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -4290,7 +4381,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "callFlutterEchoNullableDouble", + "callFlutterEchoNullableDouble" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -4330,7 +4422,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "callFlutterEchoNullableString", + "callFlutterEchoNullableString" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -4370,7 +4463,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "callFlutterEchoNullableUint8List", + "callFlutterEchoNullableUint8List" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -4411,7 +4505,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "callFlutterEchoNullableList", + "callFlutterEchoNullableList" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -4451,7 +4546,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "callFlutterEchoNullableMap", + "callFlutterEchoNullableMap" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -4491,7 +4587,8 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, BasicMessageChannel<> channel( binary_messenger, "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." - "callFlutterEchoNullableEnum", + "callFlutterEchoNullableEnum" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -4534,6 +4631,45 @@ void HostIntegrationCoreApi::SetUp(flutter::BinaryMessenger* binary_messenger, channel.SetMessageHandler(nullptr); } } + { + BasicMessageChannel<> channel( + binary_messenger, + "dev.flutter.pigeon.pigeon_integration_tests.HostIntegrationCoreApi." + "callFlutterSmallApiEchoString" + + prepended_suffix, + &GetCodec()); + if (api != nullptr) { + channel.SetMessageHandler( + [api](const EncodableValue& message, + const flutter::MessageReply& reply) { + try { + const auto& args = std::get(message); + const auto& encodable_a_string_arg = args.at(0); + if (encodable_a_string_arg.IsNull()) { + reply(WrapError("a_string_arg unexpectedly null.")); + return; + } + const auto& a_string_arg = + std::get(encodable_a_string_arg); + api->CallFlutterSmallApiEchoString( + a_string_arg, [reply](ErrorOr&& output) { + if (output.has_error()) { + reply(WrapError(output.error())); + return; + } + EncodableList wrapped; + wrapped.push_back( + EncodableValue(std::move(output).TakeValue())); + reply(EncodableValue(std::move(wrapped))); + }); + } catch (const std::exception& exception) { + reply(WrapError(exception.what())); + } + }); + } else { + channel.SetMessageHandler(nullptr); + } + } } EncodableValue HostIntegrationCoreApi::WrapError( @@ -4626,7 +4762,15 @@ void FlutterIntegrationCoreApiCodecSerializer::WriteValue( // called from C++. FlutterIntegrationCoreApi::FlutterIntegrationCoreApi( flutter::BinaryMessenger* binary_messenger) - : binary_messenger_(binary_messenger) {} + : binary_messenger_(binary_messenger), message_channel_suffix_("") {} + +FlutterIntegrationCoreApi::FlutterIntegrationCoreApi( + flutter::BinaryMessenger* binary_messenger, + const std::string& message_channel_suffix) + : binary_messenger_(binary_messenger), + message_channel_suffix_(message_channel_suffix.length() > 0 + ? std::string(".") + message_channel_suffix + : "") {} const flutter::StandardMessageCodec& FlutterIntegrationCoreApi::GetCodec() { return flutter::StandardMessageCodec::GetInstance( @@ -4638,7 +4782,8 @@ void FlutterIntegrationCoreApi::Noop( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "noop"; + "noop" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(); channel.Send( @@ -4670,7 +4815,8 @@ void FlutterIntegrationCoreApi::ThrowError( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "throwError"; + "throwError" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(); channel.Send( @@ -4703,7 +4849,8 @@ void FlutterIntegrationCoreApi::ThrowErrorFromVoid( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "throwErrorFromVoid"; + "throwErrorFromVoid" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(); channel.Send( @@ -4736,7 +4883,8 @@ void FlutterIntegrationCoreApi::EchoAllTypes( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoAllTypes"; + "echoAllTypes" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ CustomEncodableValue(everything_arg), @@ -4773,7 +4921,8 @@ void FlutterIntegrationCoreApi::EchoAllNullableTypes( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoAllNullableTypes"; + "echoAllNullableTypes" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ everything_arg ? CustomEncodableValue(*everything_arg) : EncodableValue(), @@ -4811,7 +4960,8 @@ void FlutterIntegrationCoreApi::SendMultipleNullableTypes( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "sendMultipleNullableTypes"; + "sendMultipleNullableTypes" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ a_nullable_bool_arg ? EncodableValue(*a_nullable_bool_arg) @@ -4853,7 +5003,8 @@ void FlutterIntegrationCoreApi::EchoAllNullableTypesWithoutRecursion( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoAllNullableTypesWithoutRecursion"; + "echoAllNullableTypesWithoutRecursion" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ everything_arg ? CustomEncodableValue(*everything_arg) : EncodableValue(), @@ -4892,7 +5043,8 @@ void FlutterIntegrationCoreApi::SendMultipleNullableTypesWithoutRecursion( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "sendMultipleNullableTypesWithoutRecursion"; + "sendMultipleNullableTypesWithoutRecursion" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ a_nullable_bool_arg ? EncodableValue(*a_nullable_bool_arg) @@ -4934,7 +5086,8 @@ void FlutterIntegrationCoreApi::EchoBool( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoBool"; + "echoBool" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ EncodableValue(a_bool_arg), @@ -4969,7 +5122,8 @@ void FlutterIntegrationCoreApi::EchoInt( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoInt"; + "echoInt" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ EncodableValue(an_int_arg), @@ -5004,7 +5158,8 @@ void FlutterIntegrationCoreApi::EchoDouble( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoDouble"; + "echoDouble" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ EncodableValue(a_double_arg), @@ -5040,7 +5195,8 @@ void FlutterIntegrationCoreApi::EchoString( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoString"; + "echoString" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ EncodableValue(a_string_arg), @@ -5077,7 +5233,8 @@ void FlutterIntegrationCoreApi::EchoUint8List( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoUint8List"; + "echoUint8List" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ EncodableValue(a_list_arg), @@ -5114,7 +5271,8 @@ void FlutterIntegrationCoreApi::EchoList( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoList"; + "echoList" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ EncodableValue(a_list_arg), @@ -5151,7 +5309,8 @@ void FlutterIntegrationCoreApi::EchoMap( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoMap"; + "echoMap" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ EncodableValue(a_map_arg), @@ -5187,7 +5346,8 @@ void FlutterIntegrationCoreApi::EchoEnum( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoEnum"; + "echoEnum" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ EncodableValue((int)an_enum_arg), @@ -5223,7 +5383,8 @@ void FlutterIntegrationCoreApi::EchoNullableBool( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoNullableBool"; + "echoNullableBool" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ a_bool_arg ? EncodableValue(*a_bool_arg) : EncodableValue(), @@ -5258,7 +5419,8 @@ void FlutterIntegrationCoreApi::EchoNullableInt( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoNullableInt"; + "echoNullableInt" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ an_int_arg ? EncodableValue(*an_int_arg) : EncodableValue(), @@ -5298,7 +5460,8 @@ void FlutterIntegrationCoreApi::EchoNullableDouble( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoNullableDouble"; + "echoNullableDouble" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ a_double_arg ? EncodableValue(*a_double_arg) : EncodableValue(), @@ -5335,7 +5498,8 @@ void FlutterIntegrationCoreApi::EchoNullableString( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoNullableString"; + "echoNullableString" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ a_string_arg ? EncodableValue(*a_string_arg) : EncodableValue(), @@ -5372,7 +5536,8 @@ void FlutterIntegrationCoreApi::EchoNullableUint8List( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoNullableUint8List"; + "echoNullableUint8List" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ a_list_arg ? EncodableValue(*a_list_arg) : EncodableValue(), @@ -5409,7 +5574,8 @@ void FlutterIntegrationCoreApi::EchoNullableList( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoNullableList"; + "echoNullableList" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ a_list_arg ? EncodableValue(*a_list_arg) : EncodableValue(), @@ -5446,7 +5612,8 @@ void FlutterIntegrationCoreApi::EchoNullableMap( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoNullableMap"; + "echoNullableMap" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ a_map_arg ? EncodableValue(*a_map_arg) : EncodableValue(), @@ -5482,7 +5649,8 @@ void FlutterIntegrationCoreApi::EchoNullableEnum( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoNullableEnum"; + "echoNullableEnum" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ an_enum_arg ? EncodableValue((int)(*an_enum_arg)) : EncodableValue(), @@ -5523,7 +5691,8 @@ void FlutterIntegrationCoreApi::NoopAsync( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "noopAsync"; + "noopAsync" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(); channel.Send( @@ -5556,7 +5725,8 @@ void FlutterIntegrationCoreApi::EchoAsyncString( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi." - "echoAsyncString"; + "echoAsyncString" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ EncodableValue(a_string_arg), @@ -5597,10 +5767,21 @@ const flutter::StandardMessageCodec& HostTrivialApi::GetCodec() { // `binary_messenger`. void HostTrivialApi::SetUp(flutter::BinaryMessenger* binary_messenger, HostTrivialApi* api) { + HostTrivialApi::SetUp(binary_messenger, api, ""); +} + +void HostTrivialApi::SetUp(flutter::BinaryMessenger* binary_messenger, + HostTrivialApi* api, + const std::string& message_channel_suffix) { + const std::string prepended_suffix = + message_channel_suffix.length() > 0 + ? std::string(".") + message_channel_suffix + : ""; { BasicMessageChannel<> channel( binary_messenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop", + "dev.flutter.pigeon.pigeon_integration_tests.HostTrivialApi.noop" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -5647,10 +5828,21 @@ const flutter::StandardMessageCodec& HostSmallApi::GetCodec() { // `binary_messenger`. void HostSmallApi::SetUp(flutter::BinaryMessenger* binary_messenger, HostSmallApi* api) { + HostSmallApi::SetUp(binary_messenger, api, ""); +} + +void HostSmallApi::SetUp(flutter::BinaryMessenger* binary_messenger, + HostSmallApi* api, + const std::string& message_channel_suffix) { + const std::string prepended_suffix = + message_channel_suffix.length() > 0 + ? std::string(".") + message_channel_suffix + : ""; { BasicMessageChannel<> channel( binary_messenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo", + "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.echo" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -5686,7 +5878,8 @@ void HostSmallApi::SetUp(flutter::BinaryMessenger* binary_messenger, { BasicMessageChannel<> channel( binary_messenger, - "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid", + "dev.flutter.pigeon.pigeon_integration_tests.HostSmallApi.voidVoid" + + prepended_suffix, &GetCodec()); if (api != nullptr) { channel.SetMessageHandler( @@ -5756,7 +5949,14 @@ void FlutterSmallApiCodecSerializer::WriteValue( // Generated class from Pigeon that represents Flutter messages that can be // called from C++. FlutterSmallApi::FlutterSmallApi(flutter::BinaryMessenger* binary_messenger) - : binary_messenger_(binary_messenger) {} + : binary_messenger_(binary_messenger), message_channel_suffix_("") {} + +FlutterSmallApi::FlutterSmallApi(flutter::BinaryMessenger* binary_messenger, + const std::string& message_channel_suffix) + : binary_messenger_(binary_messenger), + message_channel_suffix_(message_channel_suffix.length() > 0 + ? std::string(".") + message_channel_suffix + : "") {} const flutter::StandardMessageCodec& FlutterSmallApi::GetCodec() { return flutter::StandardMessageCodec::GetInstance( @@ -5769,7 +5969,8 @@ void FlutterSmallApi::EchoWrappedList( std::function&& on_error) { const std::string channel_name = "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi." - "echoWrappedList"; + "echoWrappedList" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ CustomEncodableValue(msg_arg), @@ -5805,7 +6006,8 @@ void FlutterSmallApi::EchoString( std::function&& on_success, std::function&& on_error) { const std::string channel_name = - "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString"; + "dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString" + + message_channel_suffix_; BasicMessageChannel<> channel(binary_messenger_, channel_name, &GetCodec()); EncodableValue encoded_api_arguments = EncodableValue(EncodableList{ EncodableValue(a_string_arg), diff --git a/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.h b/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.h index 4b15d9dbbe70..15a98bf6bba0 100644 --- a/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.h +++ b/packages/pigeon/platform_tests/test_plugin/windows/pigeon/core_tests.gen.h @@ -823,6 +823,9 @@ class HostIntegrationCoreApi { virtual void CallFlutterEchoNullableEnum( const AnEnum* an_enum, std::function> reply)> result) = 0; + virtual void CallFlutterSmallApiEchoString( + const std::string& a_string, + std::function reply)> result) = 0; // The codec used by HostIntegrationCoreApi. static const flutter::StandardMessageCodec& GetCodec(); @@ -830,6 +833,9 @@ class HostIntegrationCoreApi { // the `binary_messenger`. static void SetUp(flutter::BinaryMessenger* binary_messenger, HostIntegrationCoreApi* api); + static void SetUp(flutter::BinaryMessenger* binary_messenger, + HostIntegrationCoreApi* api, + const std::string& message_channel_suffix); static flutter::EncodableValue WrapError(std::string_view error_message); static flutter::EncodableValue WrapError(const FlutterError& error); @@ -861,6 +867,8 @@ class FlutterIntegrationCoreApiCodecSerializer class FlutterIntegrationCoreApi { public: FlutterIntegrationCoreApi(flutter::BinaryMessenger* binary_messenger); + FlutterIntegrationCoreApi(flutter::BinaryMessenger* binary_messenger, + const std::string& message_channel_suffix); static const flutter::StandardMessageCodec& GetCodec(); // A no-op function taking no arguments and returning no value, to sanity // test basic calling. @@ -979,6 +987,7 @@ class FlutterIntegrationCoreApi { private: flutter::BinaryMessenger* binary_messenger_; + std::string message_channel_suffix_; }; // An API that can be implemented for minimal, compile-only tests. @@ -998,6 +1007,9 @@ class HostTrivialApi { // `binary_messenger`. static void SetUp(flutter::BinaryMessenger* binary_messenger, HostTrivialApi* api); + static void SetUp(flutter::BinaryMessenger* binary_messenger, + HostTrivialApi* api, + const std::string& message_channel_suffix); static flutter::EncodableValue WrapError(std::string_view error_message); static flutter::EncodableValue WrapError(const FlutterError& error); @@ -1024,6 +1036,9 @@ class HostSmallApi { // `binary_messenger`. static void SetUp(flutter::BinaryMessenger* binary_messenger, HostSmallApi* api); + static void SetUp(flutter::BinaryMessenger* binary_messenger, + HostSmallApi* api, + const std::string& message_channel_suffix); static flutter::EncodableValue WrapError(std::string_view error_message); static flutter::EncodableValue WrapError(const FlutterError& error); @@ -1053,6 +1068,8 @@ class FlutterSmallApiCodecSerializer : public flutter::StandardCodecSerializer { class FlutterSmallApi { public: FlutterSmallApi(flutter::BinaryMessenger* binary_messenger); + FlutterSmallApi(flutter::BinaryMessenger* binary_messenger, + const std::string& message_channel_suffix); static const flutter::StandardMessageCodec& GetCodec(); void EchoWrappedList(const TestMessage& msg, std::function&& on_success, @@ -1063,6 +1080,7 @@ class FlutterSmallApi { private: flutter::BinaryMessenger* binary_messenger_; + std::string message_channel_suffix_; }; } // namespace core_tests_pigeontest diff --git a/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.cpp b/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.cpp index 3b22d1e36202..45593558fb27 100644 --- a/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.cpp +++ b/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.cpp @@ -24,24 +24,59 @@ using core_tests_pigeontest::AnEnum; using core_tests_pigeontest::ErrorOr; using core_tests_pigeontest::FlutterError; using core_tests_pigeontest::FlutterIntegrationCoreApi; +using core_tests_pigeontest::FlutterSmallApi; using core_tests_pigeontest::HostIntegrationCoreApi; +using core_tests_pigeontest::HostSmallApi; using flutter::EncodableList; using flutter::EncodableMap; using flutter::EncodableValue; +TestSmallApi::TestSmallApi() {}; + +TestSmallApi::~TestSmallApi() {} + +void TestSmallApi::Echo( + const std::string& a_string, + std::function reply)> result) { + result(a_string); +} + +void TestSmallApi::VoidVoid( + std::function reply)> result) { + result(std::nullopt); +} + // static void TestPlugin::RegisterWithRegistrar( flutter::PluginRegistrarWindows* registrar) { - auto plugin = std::make_unique(registrar->messenger()); + auto host_small_api_one = std::make_unique(); + auto host_small_api_two = std::make_unique(); + + HostSmallApi::SetUp(registrar->messenger(), host_small_api_one.get(), + "suffixOne"); + HostSmallApi::SetUp(registrar->messenger(), host_small_api_two.get(), + "suffixTwo"); + + auto plugin = std::make_unique(registrar->messenger(), + std::move(host_small_api_one), + std::move(host_small_api_two)); HostIntegrationCoreApi::SetUp(registrar->messenger(), plugin.get()); registrar->AddPlugin(std::move(plugin)); } -TestPlugin::TestPlugin(flutter::BinaryMessenger* binary_messenger) - : flutter_api_( - std::make_unique(binary_messenger)) {} +TestPlugin::TestPlugin(flutter::BinaryMessenger* binary_messenger, + std::unique_ptr host_small_api_one, + std::unique_ptr host_small_api_two) + : flutter_small_api_one_( + std::make_unique(binary_messenger, "suffixOne")), + flutter_small_api_two_( + std::make_unique(binary_messenger, "suffixTwo")), + host_small_api_one_(std::move(host_small_api_one)), + host_small_api_two_(std::move(host_small_api_two)), + flutter_api_( + std::make_unique(binary_messenger)) {}; TestPlugin::~TestPlugin() {} @@ -650,4 +685,28 @@ void TestPlugin::CallFlutterEchoNullableEnum( [result](const FlutterError& error) { result(error); }); } +void TestPlugin::CallFlutterSmallApiEchoString( + const std::string& a_string, + std::function reply)> result) { + flutter_small_api_one_->EchoString( + a_string, + [this, result, a_string](const std::string& echoOne) { + flutter_small_api_two_->EchoString( + a_string, + [this, result, echoOne](const std::string& echoTwo) { + if (echoOne.compare(echoTwo) == 0) { + result(echoTwo); + } else { + result(FlutterError( + "Responses do not match", + "Multi-instance responses were not matching: " + echoOne + + ", " + echoTwo, + EncodableValue(""))); + } + }, + [result](const FlutterError& error) { result(error); }); + }, + [result](const FlutterError& error) { result(error); }); +} + } // namespace test_plugin diff --git a/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.h b/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.h index 372f7440d53f..0123df09022b 100644 --- a/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.h +++ b/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.h @@ -16,6 +16,24 @@ namespace test_plugin { +class TestSmallApi : public core_tests_pigeontest::HostSmallApi { + public: + TestSmallApi(); + virtual ~TestSmallApi(); + + TestSmallApi(const TestSmallApi&) = delete; + TestSmallApi& operator=(const TestSmallApi&) = delete; + + void Echo( + const std::string& a_string, + std::function reply)> + result) override; + + void VoidVoid(std::function< + void(std::optional reply)> + result) override; +}; + // This plugin handles the native side of the integration tests in // example/integration_test/ class TestPlugin : public flutter::Plugin, @@ -23,7 +41,9 @@ class TestPlugin : public flutter::Plugin, public: static void RegisterWithRegistrar(flutter::PluginRegistrarWindows* registrar); - TestPlugin(flutter::BinaryMessenger* binary_messenger); + TestPlugin(flutter::BinaryMessenger* binary_messenger, + std::unique_ptr host_small_api_one, + std::unique_ptr host_small_api_two); virtual ~TestPlugin(); @@ -365,10 +385,20 @@ class TestPlugin : public flutter::Plugin, std::optional> reply)> result) override; + void CallFlutterSmallApiEchoString( + const std::string& a_string, + std::function reply)> + result) override; private: std::unique_ptr flutter_api_; + std::unique_ptr + flutter_small_api_one_; + std::unique_ptr + flutter_small_api_two_; + std::unique_ptr host_small_api_one_; + std::unique_ptr host_small_api_two_; }; } // namespace test_plugin diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index b4912fd32620..f368b97536ae 100644 --- a/packages/pigeon/pubspec.yaml +++ b/packages/pigeon/pubspec.yaml @@ -2,7 +2,7 @@ name: pigeon description: Code generator tool to make communication between Flutter and the host platform type-safe and easier. repository: https://github.com/flutter/packages/tree/main/packages/pigeon issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22 -version: 17.3.0 # This must match the version in lib/generator_tools.dart +version: 18.0.0 # This must match the version in lib/generator_tools.dart environment: sdk: ^3.1.0 diff --git a/packages/pigeon/test/dart_generator_test.dart b/packages/pigeon/test/dart_generator_test.dart index 4c96bd7d74af..bdb8ece598f0 100644 --- a/packages/pigeon/test/dart_generator_test.dart +++ b/packages/pigeon/test/dart_generator_test.dart @@ -356,7 +356,7 @@ void main() { ); final String code = sink.toString(); expect(code, contains('abstract class Api')); - expect(code, contains('static void setup(Api')); + expect(code, contains('static void setUp(Api')); expect(code, contains('Output doSomething(Input input)')); }); diff --git a/packages/pigeon/test/java_generator_test.dart b/packages/pigeon/test/java_generator_test.dart index 97cbfe8b4d09..d620ee6c182c 100644 --- a/packages/pigeon/test/java_generator_test.dart +++ b/packages/pigeon/test/java_generator_test.dart @@ -1371,7 +1371,7 @@ void main() { expect( code, contains(RegExp( - r'new BasicMessageChannel<>\(\s*binaryMessenger, "dev.flutter.pigeon.test_package.Api.doit", getCodec\(\), taskQueue\)'))); + r'new BasicMessageChannel<>\(\s*binaryMessenger, "dev.flutter.pigeon.test_package.Api.doit" \+ messageChannelSuffix, getCodec\(\), taskQueue\)'))); }); test('generated annotation', () { diff --git a/packages/pigeon/test/kotlin_generator_test.dart b/packages/pigeon/test/kotlin_generator_test.dart index d4817bf56e98..d0fcb1e3bc5c 100644 --- a/packages/pigeon/test/kotlin_generator_test.dart +++ b/packages/pigeon/test/kotlin_generator_test.dart @@ -458,8 +458,10 @@ void main() { dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); - expect(code, - contains('class Api(private val binaryMessenger: BinaryMessenger)')); + expect( + code, + contains( + 'class Api(private val binaryMessenger: BinaryMessenger, private val messageChannelSuffix: String = "")')); expect(code, matches('fun doSomething.*Input.*Output')); }); diff --git a/packages/pigeon/test/swift_generator_test.dart b/packages/pigeon/test/swift_generator_test.dart index 944a4bb2cefb..a4eb67427b93 100644 --- a/packages/pigeon/test/swift_generator_test.dart +++ b/packages/pigeon/test/swift_generator_test.dart @@ -303,7 +303,10 @@ void main() { ); final String code = sink.toString(); expect(code, contains('class Api')); - expect(code, contains('init(binaryMessenger: FlutterBinaryMessenger)')); + expect( + code, + contains( + 'init(binaryMessenger: FlutterBinaryMessenger, messageChannelSuffix: String = "")')); expect(code, matches('func doSomething.*Input.*Output')); expect(code, isNot(contains('if ('))); expect(code, isNot(matches(RegExp(r';$', multiLine: true)))); From d92fd140e5744294174d9f9090907a92553c42be Mon Sep 17 00:00:00 2001 From: tarrinneal Date: Tue, 2 Apr 2024 13:01:44 -0700 Subject: [PATCH 2/2] ; --- .../pigeon/platform_tests/test_plugin/windows/test_plugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.cpp b/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.cpp index 45593558fb27..0dd3e13ce192 100644 --- a/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.cpp +++ b/packages/pigeon/platform_tests/test_plugin/windows/test_plugin.cpp @@ -31,7 +31,7 @@ using flutter::EncodableList; using flutter::EncodableMap; using flutter::EncodableValue; -TestSmallApi::TestSmallApi() {}; +TestSmallApi::TestSmallApi() {} TestSmallApi::~TestSmallApi() {} @@ -76,7 +76,7 @@ TestPlugin::TestPlugin(flutter::BinaryMessenger* binary_messenger, host_small_api_one_(std::move(host_small_api_one)), host_small_api_two_(std::move(host_small_api_two)), flutter_api_( - std::make_unique(binary_messenger)) {}; + std::make_unique(binary_messenger)) {} TestPlugin::~TestPlugin() {}