chore: follow design pattern for pigeon api usage

Author: MichaelVerdon

packages/firebase_database/firebase_database_platform_interface/lib/src/method_channel/method_channel_database.dart

@@ -7,7 +7,7 @@ import 'package:firebase_database_platform_interface/firebase_database_platform_
 import 'package:firebase_database_platform_interface/src/method_channel/utils/utils.dart';
 import 'package:flutter/services.dart';
 import 'package:firebase_database_platform_interface/src/pigeon/messages.pigeon.dart'
-    as pigeon;
+    hide DatabaseReferencePlatform;
 
 import 'method_channel_database_reference.dart';
 import 'utils/exception.dart';
@@ -18,9 +18,9 @@ class MethodChannelArguments {
   FirebaseApp app;
 }
 
-class _TransactionHandlerFlutterApi extends pigeon.FirebaseDatabaseFlutterApi {
+class _TransactionHandlerFlutterApi extends FirebaseDatabaseFlutterApi {
   @override
-  Future<pigeon.TransactionHandlerResult> callTransactionHandler(
+  Future<TransactionHandlerResult> callTransactionHandler(
     int transactionKey,
     Object? snapshotValue,
   ) async {
@@ -48,7 +48,7 @@ class _TransactionHandlerFlutterApi extends pigeon.FirebaseDatabaseFlutterApi {
       MethodChannelDatabase.transactionErrors[transactionKey] = e;
     }
 
-    return pigeon.TransactionHandlerResult(
+    return TransactionHandlerResult(
       value: value != null ? transformValue(value) : null,
       aborted: aborted,
       exception: exception,
@@ -60,14 +60,14 @@ class _TransactionHandlerFlutterApi extends pigeon.FirebaseDatabaseFlutterApi {
 ///
 /// You can get an instance by calling [FirebaseDatabase.instance].
 class MethodChannelDatabase extends DatabasePlatform {
-  static final pigeonChannel = pigeon.FirebaseDatabaseHostApi();
+  static final _api = FirebaseDatabaseHostApi();
 
   /// Creates a DatabasePigeonFirebaseApp object with current settings
-  pigeon.DatabasePigeonFirebaseApp get pigeonApp {
-    return pigeon.DatabasePigeonFirebaseApp(
+  DatabasePigeonFirebaseApp get pigeonApp {
+    return DatabasePigeonFirebaseApp(
       appName: app!.name,
       databaseURL: databaseURL,
-      settings: pigeon.DatabasePigeonSettings(
+      settings: DatabasePigeonSettings(
         persistenceEnabled: _persistenceEnabled,
         cacheSizeBytes: _cacheSizeBytes,
         loggingEnabled: _loggingEnabled,
@@ -82,7 +82,7 @@ class MethodChannelDatabase extends DatabasePlatform {
     if (_initialized) return;
 
     // Set up the Pigeon FlutterApi for transaction handler callbacks
-    pigeon.FirebaseDatabaseFlutterApi.setUp(_TransactionHandlerFlutterApi());
+    FirebaseDatabaseFlutterApi.setUp(_TransactionHandlerFlutterApi());
     _initialized = true;
   }
 
@@ -131,7 +131,7 @@ class MethodChannelDatabase extends DatabasePlatform {
     _emulatorHost = host;
     _emulatorPort = port;
     // Call the Pigeon method to set up the emulator
-    pigeonChannel.useDatabaseEmulator(pigeonApp, host, port);
+    _api.useDatabaseEmulator(pigeonApp, host, port);
   }
 
   @override
@@ -146,27 +146,27 @@ class MethodChannelDatabase extends DatabasePlatform {
   void setPersistenceEnabled(bool enabled) {
     _persistenceEnabled = enabled;
     // Call the Pigeon method to set persistence
-    pigeonChannel.setPersistenceEnabled(pigeonApp, enabled);
+    _api.setPersistenceEnabled(pigeonApp, enabled);
   }
 
   @override
   void setPersistenceCacheSizeBytes(int cacheSize) {
     _cacheSizeBytes = cacheSize;
     // Call the Pigeon method to set cache size
-    pigeonChannel.setPersistenceCacheSizeBytes(pigeonApp, cacheSize);
+    _api.setPersistenceCacheSizeBytes(pigeonApp, cacheSize);
   }
 
   @override
   void setLoggingEnabled(bool enabled) {
     _loggingEnabled = enabled;
     // Call the Pigeon method to set logging
-    pigeonChannel.setLoggingEnabled(pigeonApp, enabled);
+    _api.setLoggingEnabled(pigeonApp, enabled);
   }
 
   @override
   Future<void> goOnline() {
     try {
-      return pigeonChannel.goOnline(pigeonApp);
+      return _api.goOnline(pigeonApp);
     } catch (e, s) {
       convertPlatformException(e, s);
     }
@@ -177,7 +177,7 @@ class MethodChannelDatabase extends DatabasePlatform {
   @override
   Future<void> goOffline() {
     try {
-      return pigeonChannel.goOffline(pigeonApp);
+      return _api.goOffline(pigeonApp);
     } catch (e, s) {
       convertPlatformException(e, s);
     }
@@ -196,7 +196,7 @@ class MethodChannelDatabase extends DatabasePlatform {
   @override
   Future<void> purgeOutstandingWrites() {
     try {
-      return pigeonChannel.purgeOutstandingWrites(pigeonApp);
+      return _api.purgeOutstandingWrites(pigeonApp);
     } catch (e, s) {
       convertPlatformException(e, s);
     }

packages/firebase_database/firebase_database_platform_interface/lib/src/method_channel/method_channel_database_reference.dart

@@ -5,7 +5,7 @@
 import 'package:firebase_database_platform_interface/firebase_database_platform_interface.dart';
 import 'package:firebase_database_platform_interface/src/method_channel/utils/utils.dart';
 import 'package:firebase_database_platform_interface/src/pigeon/messages.pigeon.dart'
-    as pigeon;
+    hide DatabaseReferencePlatform;
 
 import 'method_channel_database.dart';
 import 'method_channel_on_disconnect.dart';
@@ -14,6 +14,8 @@ import 'method_channel_transaction_result.dart';
 import 'utils/exception.dart';
 import 'utils/push_id_generator.dart';
 
+final _api = FirebaseDatabaseHostApi();
+
 /// DatabaseReference represents a particular location in your Firebase
 /// Database and can be used for reading or writing data to that location.
 ///
@@ -34,7 +36,7 @@ class MethodChannelDatabaseReference extends MethodChannelQuery
         );
 
   /// Gets the Pigeon app object from the database
-  pigeon.DatabasePigeonFirebaseApp get _pigeonApp {
+  DatabasePigeonFirebaseApp get _pigeonApp {
     final methodChannelDatabase = database as MethodChannelDatabase;
     return methodChannelDatabase.pigeonApp;
   }
@@ -83,9 +85,9 @@ class MethodChannelDatabaseReference extends MethodChannelQuery
   @override
   Future<void> set(Object? value) async {
     try {
-      await MethodChannelDatabase.pigeonChannel.databaseReferenceSet(
+      await _api.databaseReferenceSet(
         _pigeonApp,
-        pigeon.DatabaseReferenceRequest(
+        DatabaseReferenceRequest(
           path: path,
           value: value != null ? transformValue(value) : null,
         ),
@@ -98,10 +100,9 @@ class MethodChannelDatabaseReference extends MethodChannelQuery
   @override
   Future<void> setWithPriority(Object? value, Object? priority) async {
     try {
-      await MethodChannelDatabase.pigeonChannel
-          .databaseReferenceSetWithPriority(
+      await _api.databaseReferenceSetWithPriority(
         _pigeonApp,
-        pigeon.DatabaseReferenceRequest(
+        DatabaseReferenceRequest(
           path: path,
           value: value != null ? transformValue(value) : null,
           priority: priority,
@@ -115,9 +116,9 @@ class MethodChannelDatabaseReference extends MethodChannelQuery
   @override
   Future<void> update(Map<String, Object?> value) async {
     try {
-      await MethodChannelDatabase.pigeonChannel.databaseReferenceUpdate(
+      await _api.databaseReferenceUpdate(
         _pigeonApp,
-        pigeon.UpdateRequest(
+        UpdateRequest(
           path: path,
           value: transformValue(value)! as Map<String, Object?>,
         ),
@@ -130,9 +131,9 @@ class MethodChannelDatabaseReference extends MethodChannelQuery
   @override
   Future<void> setPriority(Object? priority) async {
     try {
-      await MethodChannelDatabase.pigeonChannel.databaseReferenceSetPriority(
+      await _api.databaseReferenceSetPriority(
         _pigeonApp,
-        pigeon.DatabaseReferenceRequest(
+        DatabaseReferenceRequest(
           path: path,
           priority: priority,
         ),
@@ -158,18 +159,17 @@ class MethodChannelDatabaseReference extends MethodChannelQuery
     MethodChannelDatabase.transactions[key] = transactionHandler;
 
     try {
-      await MethodChannelDatabase.pigeonChannel.databaseReferenceRunTransaction(
+      await _api.databaseReferenceRunTransaction(
         _pigeonApp,
-        pigeon.TransactionRequest(
+        TransactionRequest(
           path: path,
           transactionKey: key,
           applyLocally: applyLocally,
         ),
       );
 
       // Get the transaction result using Pigeon
-      final result = await MethodChannelDatabase.pigeonChannel
-          .databaseReferenceGetTransactionResult(
+      final result = await _api.databaseReferenceGetTransactionResult(
         _pigeonApp,
         key,
       );

packages/firebase_database/firebase_database_platform_interface/lib/src/method_channel/method_channel_on_disconnect.dart

@@ -5,11 +5,13 @@
 import 'package:firebase_database_platform_interface/firebase_database_platform_interface.dart';
 import 'package:firebase_database_platform_interface/src/method_channel/utils/utils.dart';
 import 'package:firebase_database_platform_interface/src/pigeon/messages.pigeon.dart'
-    as pigeon;
+    hide DatabaseReferencePlatform;
 
 import 'method_channel_database.dart';
 import 'utils/exception.dart';
 
+final _api = FirebaseDatabaseHostApi();
+
 /// Represents a query over the data at a particular location.
 class MethodChannelOnDisconnect extends OnDisconnectPlatform {
   /// Create a [MethodChannelQuery] from [DatabaseReferencePlatform]
@@ -19,17 +21,17 @@ class MethodChannelOnDisconnect extends OnDisconnectPlatform {
   }) : super(database: database, ref: ref);
 
   /// Gets the Pigeon app object from the database
-  pigeon.DatabasePigeonFirebaseApp get _pigeonApp {
+  DatabasePigeonFirebaseApp get _pigeonApp {
     final methodChannelDatabase = database as MethodChannelDatabase;
     return methodChannelDatabase.pigeonApp;
   }
 
   @override
   Future<void> set(Object? value) async {
     try {
-      await MethodChannelDatabase.pigeonChannel.onDisconnectSet(
+      await _api.onDisconnectSet(
         _pigeonApp,
-        pigeon.DatabaseReferenceRequest(
+        DatabaseReferenceRequest(
           path: ref.path,
           value: value != null ? transformValue(value) : null,
         ),
@@ -42,9 +44,9 @@ class MethodChannelOnDisconnect extends OnDisconnectPlatform {
   @override
   Future<void> setWithPriority(Object? value, Object? priority) async {
     try {
-      await MethodChannelDatabase.pigeonChannel.onDisconnectSetWithPriority(
+      await _api.onDisconnectSetWithPriority(
         _pigeonApp,
-        pigeon.DatabaseReferenceRequest(
+        DatabaseReferenceRequest(
           path: ref.path,
           value: value != null ? transformValue(value) : null,
           priority: priority,
@@ -61,7 +63,7 @@ class MethodChannelOnDisconnect extends OnDisconnectPlatform {
   @override
   Future<void> cancel() async {
     try {
-      await MethodChannelDatabase.pigeonChannel.onDisconnectCancel(
+      await _api.onDisconnectCancel(
         _pigeonApp,
         ref.path,
       );
@@ -73,9 +75,9 @@ class MethodChannelOnDisconnect extends OnDisconnectPlatform {
   @override
   Future<void> update(Map<String, Object?> value) async {
     try {
-      await MethodChannelDatabase.pigeonChannel.onDisconnectUpdate(
+      await _api.onDisconnectUpdate(
         _pigeonApp,
-        pigeon.UpdateRequest(
+        UpdateRequest(
           path: ref.path,
           value: transformValue(value)! as Map<String, Object?>,
         ),

packages/firebase_database/firebase_database_platform_interface/lib/src/method_channel/method_channel_query.dart

@@ -5,7 +5,7 @@
 import 'package:_flutterfire_internals/_flutterfire_internals.dart';
 import 'package:firebase_database_platform_interface/firebase_database_platform_interface.dart';
 import 'package:firebase_database_platform_interface/src/pigeon/messages.pigeon.dart'
-    as pigeon;
+    hide DatabaseReferencePlatform;
 import 'package:flutter/services.dart';
 
 import 'method_channel_data_snapshot.dart';
@@ -14,6 +14,8 @@ import 'method_channel_database_event.dart';
 import 'method_channel_database_reference.dart';
 import 'utils/exception.dart';
 
+final _api = FirebaseDatabaseHostApi();
+
 /// Represents a query over the data at a particular location.
 class MethodChannelQuery extends QueryPlatform {
   /// Create a [MethodChannelQuery] from [pathComponents]
@@ -27,7 +29,7 @@ class MethodChannelQuery extends QueryPlatform {
   final List<String> pathComponents;
 
   /// Gets the Pigeon app object from the database
-  pigeon.DatabasePigeonFirebaseApp get _pigeonApp {
+  DatabasePigeonFirebaseApp get _pigeonApp {
     final methodChannelDatabase = database as MethodChannelDatabase;
     return methodChannelDatabase.pigeonApp;
   }
@@ -48,9 +50,9 @@ class MethodChannelQuery extends QueryPlatform {
     List<Map<String, Object?>> modifierList = modifiers.toList();
 
     // Create the EventChannel on native using Pigeon.
-    final channelName = await MethodChannelDatabase.pigeonChannel.queryObserve(
+    final channelName = await _api.queryObserve(
       _pigeonApp,
-      pigeon.QueryRequest(
+      QueryRequest(
         path: path,
         modifiers: modifierList,
       ),
@@ -69,9 +71,9 @@ class MethodChannelQuery extends QueryPlatform {
   @override
   Future<DataSnapshotPlatform> get(QueryModifiers modifiers) async {
     try {
-      final result = await MethodChannelDatabase.pigeonChannel.queryGet(
+      final result = await _api.queryGet(
         _pigeonApp,
-        pigeon.QueryRequest(
+        QueryRequest(
           path: path,
           modifiers: modifiers.toList(),
         ),
@@ -113,9 +115,9 @@ class MethodChannelQuery extends QueryPlatform {
   @override
   Future<void> keepSynced(QueryModifiers modifiers, bool value) async {
     try {
-      await MethodChannelDatabase.pigeonChannel.queryKeepSynced(
+      await _api.queryKeepSynced(
         _pigeonApp,
-        pigeon.QueryRequest(
+        QueryRequest(
           path: path,
           modifiers: modifiers.toList(),
           value: value,