ServiceBus dict-representation acceptance and kwarg-update functionality

sdk/servicebus/azure-servicebus/azure/servicebus/_common/message.py

@@ -554,6 +554,9 @@ def add(self, message):
         :rtype: None
         :raises: :class: ~azure.servicebus.exceptions.MessageContentTooLarge, when exceeding the size limit.
         """
+        if isinstance(message, dict):
+            temp_message = Message(message.pop('body'), **message)
+            message = temp_message
         message = transform_messages_to_sendable_if_needed(message)
         message_size = message.message.get_message_encoded_size()
 
@@ -588,6 +591,9 @@ class PeekedMessage(Message):
 
     def __init__(self, message):
         # type: (uamqp.message.Message) -> None
+        if isinstance(message, dict):
+            temp_message = Message(message.pop('body'), **message)
+            message = temp_message
         super(PeekedMessage, self).__init__(None, message=message) # type: ignore
 
     def _to_outgoing_message(self):

sdk/servicebus/azure-servicebus/azure/servicebus/_servicebus_sender.py

@@ -218,6 +218,17 @@ def schedule_messages(self, messages, schedule_time_utc, **kwargs):
         """
         # pylint: disable=protected-access
         self._open()
+        if isinstance(messages, list):
+            for index, each in enumerate(messages):
+                if isinstance(each, dict):
+                    messages[index] = Message(each.pop("body"), **each)
+                else:
+                    pass
+
+        if isinstance(messages, dict):
+            temp_messages = Message(messages.pop("body"), **messages)
+            messages = temp_messages
+
         timeout = kwargs.pop("timeout", None)
         if timeout is not None and timeout <= 0:
             raise ValueError("The timeout must be greater than 0.")
@@ -316,6 +327,7 @@ def from_connection_string(
         return cls(**constructor_args)
 
     def send_messages(self, message, **kwargs):
+
         # type: (Union[Message, BatchMessage, List[Message]], Any) -> None
         """Sends message and blocks until acknowledgement is received or operation times out.
 
@@ -346,6 +358,15 @@ def send_messages(self, message, **kwargs):
                 :caption: Send message.
 
         """
+        if isinstance(message, list):
+            for index, each in enumerate(message):
+                if isinstance(each, dict):
+                    message[index] = Message(each.pop("body"), **each)
+                else:
+                    pass
+        if isinstance(message, dict):
+            temporary_message = Message(message.pop('body'), **message)
+            message = temporary_message
         timeout = kwargs.pop("timeout", None)
         if timeout is not None and timeout <= 0:
             raise ValueError("The timeout must be greater than 0.")

sdk/servicebus/azure-servicebus/azure/servicebus/aio/_servicebus_sender_async.py

@@ -132,6 +132,9 @@ async def _open(self):
     async def _send(self, message, timeout=None, last_exception=None):
         await self._open()
         default_timeout = self._handler._msg_timeout  # pylint: disable=protected-access
+        if isinstance(message, dict):
+            temp_message = Message(message.pop("body"), **message)
+            message = temp_message
         try:
             self._set_msg_timeout(timeout, last_exception)
             await self._handler.send_message_async(message.message)
@@ -165,6 +168,15 @@ async def schedule_messages(
         """
         # pylint: disable=protected-access
         await self._open()
+        if isinstance(messages, list):
+            for index, each in messages:
+                if isinstance(each, dict):
+                    messages[index] = Message(each.pop("body"), **each)
+                else:
+                    pass
+        if isinstance(messages, dict):
+            temp_message = Message(messages.pop("body"), **messages)
+            messages = temp_message
         timeout = kwargs.pop("timeout", None)
         if timeout is not None and timeout <= 0:
             raise ValueError("The timeout must be greater than 0.")
@@ -286,6 +298,15 @@ async def send_messages(self, message: Union[Message, BatchMessage, List[Message
                 :caption: Send message.
 
         """
+        if isinstance(message, list):
+            for index, each in message:
+                if isinstance(each, dict):
+                    message[index] = Message(each.pop("body"), **each)
+                else:
+                    pass
+        if isinstance(message, dict):
+            temp_message = Message(message.pop("body"), **message)
+            message = temp_message
         timeout = kwargs.pop("timeout", None)
         if timeout is not None and timeout <= 0:
             raise ValueError("The timeout must be greater than 0.")

sdk/servicebus/azure-servicebus/azure/servicebus/aio/management/_management_client_async.py

@@ -286,8 +286,12 @@ async def update_queue(self, queue: QueueProperties, **kwargs) -> None:
         :type queue: ~azure.servicebus.management.QueueProperties
         :rtype: None
         """
+        if isinstance(queue, dict):
+            dict_to_queue_props = QueueProperties(queue.pop("name"), **queue)
+            to_update = dict_to_queue_props._to_internal_entity()
+        else:
+            to_update = queue._to_internal_entity()
 
-        to_update = queue._to_internal_entity()
         to_update.default_message_time_to_live = avoid_timedelta_overflow(to_update.default_message_time_to_live)
         to_update.auto_delete_on_idle = avoid_timedelta_overflow(to_update.auto_delete_on_idle)
 
@@ -479,8 +483,11 @@ async def update_topic(self, topic: TopicProperties, **kwargs) -> None:
         :type topic: ~azure.servicebus.management.TopicProperties
         :rtype: None
         """
-
-        to_update = topic._to_internal_entity()
+        if isinstance(topic, dict):
+            dict_to_topic_props = TopicProperties(topic.pop("name"), **topic)
+            to_update = dict_to_topic_props._to_internal_entity()
+        else:
+            to_update = topic._to_internal_entity()
 
         to_update.default_message_time_to_live = avoid_timedelta_overflow(to_update.default_message_time_to_live)
         to_update.auto_delete_on_idle = avoid_timedelta_overflow(to_update.auto_delete_on_idle)
@@ -685,8 +692,11 @@ async def update_subscription(
         :rtype: None
         """
         _validate_entity_name_type(topic_name, display_name='topic_name')
-
-        to_update = subscription._to_internal_entity()
+        if isinstance(subscription, dict):
+            dict_to_subscription_props = SubscriptionProperties(subscription.pop("name"), **subscription)
+            to_update = dict_to_subscription_props._to_internal_entity()
+        else:
+            to_update = subscription._to_internal_entity()
 
         to_update.default_message_time_to_live = avoid_timedelta_overflow(to_update.default_message_time_to_live)
         to_update.auto_delete_on_idle = avoid_timedelta_overflow(to_update.auto_delete_on_idle)
@@ -853,8 +863,11 @@ async def update_rule(
         :rtype: None
         """
         _validate_topic_and_subscription_types(topic_name, subscription_name)
-
-        to_update = rule._to_internal_entity()
+        if isinstance(rule, dict):
+            dict_to_rule_props = RuleProperties(rule.pop('name'), **rule)
+            to_update = dict_to_rule_props._to_internal_entity()
+        else:
+            to_update = rule._to_internal_entity()
 
         create_entity_body = CreateRuleBody(
             content=CreateRuleBodyContent(

sdk/servicebus/azure-servicebus/azure/servicebus/management/_management_client.py

@@ -280,9 +280,15 @@ def update_queue(self, queue, **kwargs):
         :type queue: ~azure.servicebus.management.QueueProperties
         :rtype: None
         """
-
-        to_update = queue._to_internal_entity()
-
+        if kwargs:
+            queue._internal_qd = None 
+            queue.__dict__.update([(key, kwargs.pop(key)) for key in kwargs.copy() if key in queue.__dict__.keys()])
+
+        if isinstance(queue, dict):
+            dict_to_queue_props = QueueProperties(queue.pop('name'), **queue) 
+            to_update = dict_to_queue_props._to_internal_entity()
+        else:
+            to_update = queue._to_internal_entity() 
         to_update.default_message_time_to_live = avoid_timedelta_overflow(to_update.default_message_time_to_live)
         to_update.auto_delete_on_idle = avoid_timedelta_overflow(to_update.auto_delete_on_idle)
 
@@ -482,9 +488,15 @@ def update_topic(self, topic, **kwargs):
         :type topic: ~azure.servicebus.management.TopicProperties
         :rtype: None
         """
-
-        to_update = topic._to_internal_entity()
-
+        if kwargs:
+            topic._internal_qd = None 
+            topic.__dict__.update([(key, kwargs.pop(key)) for key in kwargs.copy() if key in topic.__dict__.keys()])
+
+        if isinstance(topic, dict):
+            dict_to_topic_props = TopicProperties(topic.pop('name'), **topic)
+            to_update = dict_to_topic_props._to_internal_entity()
+        else:
+            to_update = topic._to_internal_entity()
         to_update.default_message_time_to_live = kwargs.get(
             "default_message_time_to_live") or topic.default_message_time_to_live
         to_update.duplicate_detection_history_time_window = kwargs.get(
@@ -692,8 +704,15 @@ def update_subscription(self, topic_name, subscription, **kwargs):
         :rtype: None
         """
         _validate_entity_name_type(topic_name, display_name='topic_name')
-
-        to_update = subscription._to_internal_entity()
+
+        if kwargs:
+            subscription._internal_qd = None 
+            subscription.__dict__.update([(key, kwargs.pop(key)) for key in kwargs.copy() if key in subscription.__dict__.keys()])
+        if isinstance(subscription, dict):
+            dict_to_subscription_props = SubscriptionProperties(subscription.pop('name'), **subscription)
+            to_update = dict_to_subscription_props._to_internal_entity()
+        else:
+            to_update = subscription._to_internal_entity()
 
         to_update.default_message_time_to_live = avoid_timedelta_overflow(to_update.default_message_time_to_live)
         to_update.auto_delete_on_idle = avoid_timedelta_overflow(to_update.auto_delete_on_idle)
@@ -856,8 +875,15 @@ def update_rule(self, topic_name, subscription_name, rule, **kwargs):
         :rtype: None
         """
         _validate_topic_and_subscription_types(topic_name, subscription_name)
+        if kwargs:
+            rule._internal_qd = None 
+            rule.__dict__.update([(key, kwargs.pop(key)) for key in kwargs.copy() if key in rule.__dict__.keys()])
+        if isinstance(rule, dict):
+            dict_to_rule_props = RuleProperties(rule.pop("name"), **rule)
+            to_update = dict_to_rule_props._to_internal_entity()
+        else:
+            to_update = rule._to_internal_entity()
 
-        to_update = rule._to_internal_entity()
 
         create_entity_body = CreateRuleBody(
             content=CreateRuleBodyContent(