Move BATCH_PART_BOUNDARY in to _messaging_utils BatchMessageEncoder

Author: ZachOrr

firebase_admin/_messaging_utils.py

@@ -778,15 +778,17 @@ def default(self, obj): # pylint: disable=method-hidden
 class BatchMessageEncoder(object):
     """A custom encoder for converting JSON for Messages into batch request data."""
 
+    BATCH_PART_BOUNDARY = '__END_OF_PART__'
+
     @classmethod
-    def encode(cls, url, headers, boundary, message_data):
-        parts = [cls._batch_request_part(url, headers, boundary, md, index) for (index, md) in enumerate(message_data)]
-        return '{}--{}--\r\n'.format(''.join(parts), boundary)
+    def encode(cls, url, headers, message_data):
+        parts = [cls._batch_request_part(url, headers, md, index) for (index, md) in enumerate(message_data)]
+        return '{}--{}--\r\n'.format(''.join(parts), cls.BATCH_PART_BOUNDARY)
 
     @classmethod
-    def _batch_request_part(cls, url, headers, boundary, message_data, index):
+    def _batch_request_part(cls, url, headers, message_data, index):
         data = cls._batch_request_part_data(url, headers, message_data)
-        part = '--{}\r\n'.format(boundary)
+        part = '--{}\r\n'.format(cls.BATCH_PART_BOUNDARY)
         part += 'Content-Length: {}\r\n'.format(len(data))
         part += 'Content-Type: application/http\r\n'
         part += 'content-id: {}\r\n'.format(index + 1)

firebase_admin/messaging.py

@@ -254,8 +254,6 @@ class _MessagingService(object):
     BATCH_ENCODER = _messaging_utils.BatchMessageEncoder()
     BATCH_DECODER = _messaging_utils.BatchMessageResponseDecoder()
 
-    BATCH_PART_BOUNDARY = '__END_OF_PART__'
-
     INTERNAL_ERROR = 'internal-error'
     UNKNOWN_ERROR = 'unknown-error'
     FCM_ERROR_CODES = {
@@ -322,11 +320,10 @@ def sendAll(self, messages, dry_run=False):
         data = _MessagingService.BATCH_ENCODER.encode(
             url=self._fcm_url,
             headers=self._fcm_headers,
-            boundary=_MessagingService.BATCH_PART_BOUNDARY,
             message_data=message_data
         )
         headers = {
-            'Content-Type': 'multipart/mixed; boundary={}'.format(_MessagingService.BATCH_PART_BOUNDARY)
+            'Content-Type': 'multipart/mixed; boundary={}'.format(_MessagingService.BATCH_ENCODER.BATCH_PART_BOUNDARY)
         }
         try:
             resp = self._client.request(