removing useless queue_type parameter

Author: DanielePalaia

examples/getting_started/main.py

@@ -3,7 +3,6 @@
     Connection,
     ExchangeSpecification,
     Message,
-    QueueType,
     QuorumQueueSpecification,
     exchange_address,
 )
@@ -23,9 +22,7 @@ def main() -> None:
     print("declaring exchange and queue")
     management.declare_exchange(ExchangeSpecification(name=exchange_name, arguments={}))
 
-    management.declare_queue(
-        QuorumQueueSpecification(name=queue_name, queue_type=QueueType.quorum)
-    )
+    management.declare_queue(QuorumQueueSpecification(name=queue_name))
 
     print("binding queue to exchange")
     bind_name = management.bind(

rabbitmq_amqp_python_client/management.py

@@ -171,7 +171,7 @@ def _declare_queue(
 
         body["auto_delete"] = queue_specification.is_auto_delete
         body["durable"] = queue_specification.is_durable
-        args["x-queue-type"] = queue_specification.queue_type.value
+
         if queue_specification.dead_letter_exchange is not None:
             args["x-dead-letter-exchange"] = queue_specification.dead_letter_exchange
         if queue_specification.dead_letter_routing_key is not None:
@@ -194,10 +194,12 @@ def _declare_queue(
             )
 
         if isinstance(queue_specification, ClassicQueueSpecification):
+            args["x-queue-type"] = QueueType.classic.value
             if queue_specification.maximum_priority is not None:
                 args["x-maximum-priority"] = queue_specification.maximum_priority
 
         if isinstance(queue_specification, QuorumQueueSpecification):
+            args["x-queue-type"] = QueueType.quorum.value
             if queue_specification.deliver_limit is not None:
                 args["x-deliver-limit"] = queue_specification.deliver_limit
 
@@ -225,7 +227,7 @@ def _declare_stream(
         body = {}
         args: dict[str, Any] = {}
 
-        args["x-queue-type"] = stream_specification.queue_type.value
+        args["x-queue-type"] = QueueType.stream.value
 
         if stream_specification.max_len_bytes is not None:
             args["x-max-length-bytes"] = stream_specification.max_len_bytes

rabbitmq_amqp_python_client/queues.py

@@ -1,8 +1,6 @@
 from dataclasses import dataclass
 from typing import Optional
 
-from .common import QueueType
-
 
 @dataclass
 class QueueSpecification:
@@ -22,13 +20,11 @@ class QueueSpecification:
 
 @dataclass
 class ClassicQueueSpecification(QueueSpecification):
-    queue_type: QueueType = QueueType.classic
     maximum_priority: Optional[int] = None
 
 
 @dataclass
 class QuorumQueueSpecification(QueueSpecification):
-    queue_type: QueueType = QueueType.quorum
     deliver_limit: Optional[str] = None
     dead_letter_strategy: Optional[str] = None
     quorum_initial_group_size: Optional[int] = None
@@ -38,7 +34,6 @@ class QuorumQueueSpecification(QueueSpecification):
 @dataclass
 class StreamSpecification:
     name: str
-    queue_type: QueueType = QueueType.stream
     max_len_bytes: Optional[int] = None
     max_time_retention: Optional[int] = None
     max_segment_size_in_bytes: Optional[int] = None

tests/test_management.py

@@ -89,7 +89,7 @@ def test_queue_info_with_validations(management: Management) -> None:
     management.delete_queue(queue_name)
 
     assert queue_info.name == queue_name
-    assert queue_info.queue_type == queue_specification.queue_type
+    assert queue_info.queue_type == QueueType.quorum
     assert queue_info.is_durable == queue_specification.is_durable
     assert queue_info.message_count == 0
 
@@ -108,7 +108,7 @@ def test_queue_info_for_stream_with_validations(management: Management) -> None:
     management.delete_queue(stream_name)
 
     assert stream_info.name == stream_name
-    assert stream_info.queue_type == queue_specification.queue_type
+    assert stream_info.queue_type == QueueType.stream
     assert stream_info.message_count == 0
 
 
@@ -145,13 +145,11 @@ def test_declare_classic_queue(management: Management) -> None:
 
     queue_specification = QuorumQueueSpecification(
         name=queue_name,
-        queue_type=QueueType.classic,
         is_auto_delete=False,
     )
     queue_info = management.declare_queue(queue_specification)
 
     assert queue_info.name == queue_specification.name
-    assert queue_info.queue_type == queue_specification.queue_type
 
     management.delete_queue(queue_name)
 
@@ -162,7 +160,6 @@ def test_declare_classic_queue_with_args(management: Management) -> None:
 
     queue_specification = ClassicQueueSpecification(
         name=queue_name,
-        queue_type=QueueType.classic,
         is_auto_delete=False,
         dead_letter_exchange="my_exchange",
         dead_letter_routing_key="my_key",
@@ -197,7 +194,6 @@ def test_declare_classic_queue_with_invalid_args(management: Management) -> None
 
     queue_specification = ClassicQueueSpecification(
         name=queue_name,
-        queue_type=QueueType.classic,
         max_len=-5,
     )
 

tests/test_publisher.py

@@ -30,6 +30,7 @@ def test_publish_queue(connection: Connection) -> None:
     publisher.close()
 
     management.delete_queue(queue_name)
+    management.close()
 
 
 def test_publish_exchange(connection: Connection) -> None:
@@ -67,6 +68,7 @@ def test_publish_exchange(connection: Connection) -> None:
 
     management.delete_exchange(exchange_name)
     management.delete_queue(queue_name)
+    management.close()
 
 
 def test_publish_purge(connection: Connection) -> None:
@@ -97,3 +99,4 @@ def test_publish_purge(connection: Connection) -> None:
     publisher.close()
 
     management.delete_queue(queue_name)
+    management.close()