fixes for code review

Author: DanielePalaia

examples/getting_started/getting_started.py

@@ -4,11 +4,11 @@
 from rabbitmq_amqp_python_client import (  # SSlConfigurationContext,; SslConfigurationContext,; ClientCert,
     AddressHelper,
     AMQPMessagingHandler,
-    BindingSpecification,
     Connection,
     Environment,
     Event,
     ExchangeSpecification,
+    ExchangeToQueueBindingSpecification,
     Message,
     OutcomeState,
     QuorumQueueSpecification,
@@ -102,7 +102,7 @@ def main() -> None:
 
     print("binding queue to exchange")
     bind_name = management.bind(
-        BindingSpecification(
+        ExchangeToQueueBindingSpecification(
             source_exchange=exchange_name,
             destination_queue=queue_name,
             binding_key=routing_key,

examples/reconnection/reconnection_example.py

@@ -8,13 +8,13 @@
 from rabbitmq_amqp_python_client import (
     AddressHelper,
     AMQPMessagingHandler,
-    BindingSpecification,
     Connection,
     ConnectionClosed,
     Consumer,
     Environment,
     Event,
     ExchangeSpecification,
+    ExchangeToQueueBindingSpecification,
     Management,
     Message,
     Publisher,
@@ -160,7 +160,7 @@ def main() -> None:
 
     print("binding queue to exchange")
     bind_name = connection_configuration.management.bind(
-        BindingSpecification(
+        ExchangeToQueueBindingSpecification(
             source_exchange=exchange_name,
             destination_queue=queue_name,
             binding_key=routing_key,

examples/tls/tls_example.py

@@ -4,12 +4,12 @@
 from rabbitmq_amqp_python_client import (  # SSlConfigurationContext,; SslConfigurationContext,; ClientCert,
     AddressHelper,
     AMQPMessagingHandler,
-    BindingSpecification,
     ClientCert,
     Connection,
     Environment,
     Event,
     ExchangeSpecification,
+    ExchangeToQueueBindingSpecification,
     Message,
     QuorumQueueSpecification,
     SslConfigurationContext,
@@ -102,7 +102,7 @@ def main() -> None:
 
     print("binding queue to exchange")
     bind_name = management.bind(
-        BindingSpecification(
+        ExchangeToQueueBindingSpecification(
             source_exchange=exchange_name,
             destination_queue=queue_name,
             binding_key=routing_key,

rabbitmq_amqp_python_client/__init__.py

@@ -6,14 +6,14 @@
 from .connection import Connection
 from .consumer import Consumer
 from .entities import (
-    BindingSpecification,
     ExchangeSpecification,
+    ExchangeToExchangeBindingSpecification,
+    ExchangeToQueueBindingSpecification,
     OffsetSpecification,
     StreamOptions,
 )
 from .environment import Environment
 from .exceptions import (
-    AmqpValidationException,
     ArgumentOutOfRangeException,
     ValidationCodeException,
 )
@@ -53,7 +53,8 @@
     "QuorumQueueSpecification",
     "ClassicQueueSpecification",
     "StreamSpecification",
-    "BindingSpecification",
+    "ExchangeToQueueBindingSpecification",
+    "ExchangeToExchangeBindingSpecification",
     "QueueType",
     "Publisher",
     "Message",
@@ -74,5 +75,4 @@
     "OffsetSpecification",
     "OutcomeState",
     "Environment",
-    "AmqpValidationException",
 ]

rabbitmq_amqp_python_client/address_helper.py

@@ -1,6 +1,9 @@
 from typing import Optional
 
-from .entities import BindingSpecification
+from .entities import (
+    ExchangeToExchangeBindingSpecification,
+    ExchangeToQueueBindingSpecification,
+)
 from .qpid.proton._message import Message
 
 
@@ -63,7 +66,7 @@ def path_address() -> str:
 
     @staticmethod
     def binding_path_with_exchange_queue(
-        bind_specification: BindingSpecification,
+        bind_specification: ExchangeToQueueBindingSpecification,
     ) -> str:
         if bind_specification.binding_key is not None:
             key = ";key=" + encode_path_segment(bind_specification.binding_key)
@@ -85,7 +88,7 @@ def binding_path_with_exchange_queue(
 
     @staticmethod
     def binding_path_with_exchange_exchange(
-        bind_specification: BindingSpecification,
+        bind_specification: ExchangeToExchangeBindingSpecification,
     ) -> str:
         binding_path_wth_exchange_exchange_key = (
             "/bindings"

rabbitmq_amqp_python_client/entities.py

@@ -41,11 +41,17 @@ class OffsetSpecification(Enum):
 
 
 @dataclass
-class BindingSpecification:
+class ExchangeToQueueBindingSpecification:
     source_exchange: str
+    destination_queue: str
+    binding_key: Optional[str] = None
+
+
+@dataclass
+class ExchangeToExchangeBindingSpecification:
+    source_exchange: str
+    destination_exchange: str
     binding_key: Optional[str] = None
-    destination_exchange: Optional[str] = None
-    destination_queue: Optional[str] = None
 
 
 class StreamOptions:

rabbitmq_amqp_python_client/exceptions.py

@@ -14,12 +14,3 @@ def __init__(self, msg: str):
 
     def __str__(self) -> str:
         return repr(self.msg)
-
-
-class AmqpValidationException(BaseException):
-    # Constructor or Initializer
-    def __init__(self, msg: str):
-        self.msg = msg
-
-    def __str__(self) -> str:
-        return repr(self.msg)

rabbitmq_amqp_python_client/management.py

@@ -5,14 +5,12 @@
 from .address_helper import AddressHelper
 from .common import CommonValues, QueueType
 from .entities import (
-    BindingSpecification,
     ExchangeSpecification,
+    ExchangeToExchangeBindingSpecification,
+    ExchangeToQueueBindingSpecification,
     QueueInfo,
 )
-from .exceptions import (
-    AmqpValidationException,
-    ValidationCodeException,
-)
+from .exceptions import ValidationCodeException
 from .options import ReceiverOption, SenderOption
 from .qpid.proton._message import Message
 from .qpid.proton.utils import (
@@ -304,19 +302,23 @@ def _validate_reponse_code(
             "wrong response code received: " + str(response_code)
         )
 
-    def bind(self, bind_specification: BindingSpecification) -> str:
+    def bind(
+        self,
+        bind_specification: Union[
+            ExchangeToQueueBindingSpecification, ExchangeToExchangeBindingSpecification
+        ],
+    ) -> str:
         logger.debug("Bind Operation called")
-        self._validate_binding(bind_specification)
 
         body = {}
         if bind_specification.binding_key is not None:
             body["binding_key"] = bind_specification.binding_key
         else:
             body["binding_key"] = ""
         body["source"] = bind_specification.source_exchange
-        if bind_specification.destination_queue is not None:
+        if isinstance(bind_specification, ExchangeToQueueBindingSpecification):
             body["destination_queue"] = bind_specification.destination_queue
-        elif bind_specification.destination_exchange is not None:
+        elif isinstance(bind_specification, ExchangeToExchangeBindingSpecification):
             body["destination_exchange"] = bind_specification.destination_exchange
 
         body["arguments"] = {}  # type: ignore
@@ -332,47 +334,34 @@ def bind(self, bind_specification: BindingSpecification) -> str:
             ],
         )
 
-        if bind_specification.destination_queue is not None:
+        if isinstance(bind_specification, ExchangeToQueueBindingSpecification):
             binding_path = AddressHelper.binding_path_with_exchange_queue(
                 bind_specification
             )
-        elif bind_specification.destination_exchange is not None:
+        elif isinstance(bind_specification, ExchangeToExchangeBindingSpecification):
             binding_path = AddressHelper.binding_path_with_exchange_exchange(
                 bind_specification
             )
 
         return binding_path
 
-    def _validate_binding(self, bind_specification: BindingSpecification) -> None:
-        if (
-            bind_specification.destination_queue is not None
-            and bind_specification.destination_exchange is not None
-        ):
-            raise AmqpValidationException(
-                "just one of destination_queue and destination_exchange of BindingSpecification must be set "
-                "for a binding operation"
-            )
-
-        if (
-            bind_specification.destination_queue is None
-            and bind_specification.destination_exchange is None
-        ):
-            raise AmqpValidationException(
-                "at least one of destination_queue and destination_exchange of BindingSpecification must be set "
-                "for a binding operation"
-            )
-
-    def unbind(self, bind_specification: Union[BindingSpecification, str]) -> None:
+    def unbind(
+        self,
+        bind_specification: Union[
+            str,
+            ExchangeToQueueBindingSpecification,
+            ExchangeToExchangeBindingSpecification,
+        ],
+    ) -> None:
         logger.debug("UnBind Operation called")
         if isinstance(bind_specification, str):
             binding_name = bind_specification
         else:
-            self._validate_binding(bind_specification)
-            if bind_specification.destination_queue is not None:
+            if isinstance(bind_specification, ExchangeToQueueBindingSpecification):
                 binding_name = AddressHelper.binding_path_with_exchange_queue(
                     bind_specification
                 )
-            elif bind_specification.destination_exchange is not None:
+            elif isinstance(bind_specification, ExchangeToExchangeBindingSpecification):
                 binding_name = AddressHelper.binding_path_with_exchange_exchange(
                     bind_specification
                 )

tests/test_management.py

@@ -1,10 +1,10 @@
 from datetime import timedelta
 
 from rabbitmq_amqp_python_client import (
-    AmqpValidationException,
-    BindingSpecification,
     ClassicQueueSpecification,
     ExchangeSpecification,
+    ExchangeToExchangeBindingSpecification,
+    ExchangeToQueueBindingSpecification,
     ExchangeType,
     Management,
     QueueType,
@@ -74,7 +74,7 @@ def test_bind_exchange_to_queue(management: Management) -> None:
     management.declare_queue(QuorumQueueSpecification(name=queue_name))
 
     binding_exchange_queue_path = management.bind(
-        BindingSpecification(
+        ExchangeToQueueBindingSpecification(
             source_exchange=exchange_name,
             destination_queue=queue_name,
             binding_key=routing_key,
@@ -99,34 +99,6 @@ def test_bind_exchange_to_queue(management: Management) -> None:
     management.unbind(binding_exchange_queue_path)
 
 
-def test_bind_no_destination(management: Management) -> None:
-
-    exchange_name = "test-bind-exchange-to-queue-exchange"
-    queue_name = "test-bind-exchange-to-queue-queue"
-    routing_key = "routing-key"
-    raised = False
-
-    management.declare_exchange(ExchangeSpecification(name=exchange_name))
-
-    management.declare_queue(QuorumQueueSpecification(name=queue_name))
-
-    try:
-        management.bind(
-            BindingSpecification(
-                source_exchange=exchange_name,
-                binding_key=routing_key,
-            )
-        )
-    except AmqpValidationException:
-        raised = True
-
-    assert raised is True
-
-    management.delete_exchange(exchange_name)
-
-    management.delete_queue(queue_name)
-
-
 def test_bind_exchange_to_queue_without_key(management: Management) -> None:
 
     exchange_name = "test-bind-exchange-to-queue-exchange"
@@ -137,7 +109,7 @@ def test_bind_exchange_to_queue_without_key(management: Management) -> None:
     management.declare_queue(QuorumQueueSpecification(name=queue_name))
 
     binding_exchange_queue_path = management.bind(
-        BindingSpecification(
+        ExchangeToQueueBindingSpecification(
             source_exchange=exchange_name,
             destination_queue=queue_name,
         )
@@ -165,14 +137,14 @@ def test_bind_unbind_by_binding_spec(management: Management) -> None:
     management.declare_queue(QuorumQueueSpecification(name=queue_name))
 
     management.bind(
-        BindingSpecification(
+        ExchangeToQueueBindingSpecification(
             source_exchange=exchange_name,
             destination_queue=queue_name,
         )
     )
 
     management.unbind(
-        BindingSpecification(
+        ExchangeToQueueBindingSpecification(
             source_exchange=exchange_name,
             destination_queue=queue_name,
         )
@@ -194,7 +166,7 @@ def test_bind_exchange_to_exchange(management: Management) -> None:
     management.declare_exchange(ExchangeSpecification(name=destination_exchange_name))
 
     binding_exchange_exchange_path = management.bind(
-        BindingSpecification(
+        ExchangeToExchangeBindingSpecification(
             source_exchange=source_exchange_name,
             destination_exchange=destination_exchange_name,
             binding_key=routing_key,