some renaming

Author: DanielePalaia

examples/getting_started/basic_example.py

@@ -125,7 +125,7 @@ def main() -> None:
     print(
         "create a consumer and consume the test message - press control + c to terminate to consume"
     )
-    consumer = connection.consumer(addr_queue, handler=MyMessageHandler())
+    consumer = connection.consumer(addr_queue, message_handler=MyMessageHandler())
 
     try:
         consumer.run()

examples/getting_started/example_with_streams.py

@@ -90,11 +90,11 @@ def main() -> None:
     # can be first, last, next or an offset long
     # you can also specify stream filters with methods: apply_filters and filter_match_unfiltered
     stream_filter_options.offset(OffsetSpecification.first)
-    stream_filter_options.apply_filters(["banana"])
+    stream_filter_options.filter_values(["banana"])
 
     consumer = consumer_connection.consumer(
         addr_queue,
-        handler=MyMessageHandler(),
+        message_handler=MyMessageHandler(),
         stream_filter_options=stream_filter_options,
     )
     print(

examples/getting_started/reconnection_example.py

@@ -61,7 +61,7 @@ def on_disconnection():
     if connection_configuration.consumer is not None:
         connection_configuration.consumer = (
             connection_configuration.connection.consumer(
-                addr_queue, handler=MyMessageHandler()
+                addr_queue, message_handler=MyMessageHandler()
             )
         )
 
@@ -111,15 +111,15 @@ def on_link_closed(self, event: Event) -> None:
 
 
 def create_connection() -> Connection:
-    # for multinode specify a list of urls and fill the field urls of Connection instead of url
-    # urls = [
+    # for multinode specify a list of urls and fill the field uris of Connection instead of url
+    # uris = [
     #    "amqp://ha_tls-rabbit_node0-1:5682/",
     #    "amqp://ha_tls-rabbit_node1-1:5692/",
     #    "amqp://ha_tls-rabbit_node2-1:5602/",
     # ]
-    # connection = Connection(urls=urls, on_disconnection_handler=on_disconnected)
+    # connection = Connection(uris=uris, on_disconnection_handler=on_disconnected)
     connection = Connection(
-        url="amqp://guest:guest@localhost:5672/",
+        uri="amqp://guest:guest@localhost:5672/",
         on_disconnection_handler=on_disconnection,
     )
     connection.dial()
@@ -207,7 +207,7 @@ def main() -> None:
     if connection_configuration.consumer is None:
         connection_configuration.consumer = (
             connection_configuration.connection.consumer(
-                addr_queue, handler=MyMessageHandler()
+                addr_queue, message_handler=MyMessageHandler()
             )
         )
 

examples/getting_started/tls_example.py

@@ -135,7 +135,7 @@ def main() -> None:
     print(
         "create a consumer and consume the test message - press control + c to terminate to consume"
     )
-    consumer = connection.consumer(addr_queue, handler=MyMessageHandler())
+    consumer = connection.consumer(addr_queue, message_handler=MyMessageHandler())
 
     try:
         consumer.run()

rabbitmq_amqp_python_client/address_helper.py

@@ -38,14 +38,14 @@ def exchange_address(exchange_name: str, routing_key: str = "") -> str:
         return path
 
     @staticmethod
-    def queue_address(queue_name: str) -> str:
-        path = "/queues/" + encode_path_segment(queue_name)
+    def queue_address(name: str) -> str:
+        path = "/queues/" + encode_path_segment(name)
 
         return path
 
     @staticmethod
-    def purge_queue_address(queue_name: str) -> str:
-        path = "/queues/" + encode_path_segment(queue_name) + "/messages"
+    def purge_queue_address(name: str) -> str:
+        path = "/queues/" + encode_path_segment(name) + "/messages"
 
         return path
 

rabbitmq_amqp_python_client/connection.py

@@ -22,16 +22,16 @@ class Connection:
     def __init__(
         self,
         # single-node mode
-        url: Optional[str] = None,
+        uri: Optional[str] = None,
         # multi-node mode
-        urls: Optional[list[str]] = None,
+        uris: Optional[list[str]] = None,
         ssl_context: Optional[SslConfigurationContext] = None,
         on_disconnection_handler: Optional[CB] = None,  # type: ignore
     ):
-        if url is None and urls is None:
+        if uri is None and uris is None:
             raise ValueError("You need to specify at least an addr or a list of addr")
-        self._addr: Optional[str] = url
-        self._addrs: Optional[list[str]] = urls
+        self._addr: Optional[str] = uri
+        self._addrs: Optional[list[str]] = uris
         self._conn: BlockingConnection
         self._management: Management
         self._on_disconnection_handler = on_disconnection_handler
@@ -87,7 +87,7 @@ def publisher(self, destination: str) -> Publisher:
     def consumer(
         self,
         destination: str,
-        handler: Optional[MessagingHandler] = None,
+        message_handler: Optional[MessagingHandler] = None,
         stream_filter_options: Optional[StreamOptions] = None,
         credit: Optional[int] = None,
     ) -> Consumer:
@@ -96,6 +96,6 @@ def consumer(
                 "destination address must start with /queues or /exchanges"
             )
         consumer = Consumer(
-            self._conn, destination, handler, stream_filter_options, credit
+            self._conn, destination, message_handler, stream_filter_options, credit
         )
         return consumer

rabbitmq_amqp_python_client/entities.py

@@ -62,7 +62,7 @@ def offset(self, offset_spefication: Union[OffsetSpecification, int]) -> None:
                 symbol(STREAM_OFFSET_SPEC), offset_spefication.name
             )
 
-    def apply_filters(self, filters: list[str]) -> None:
+    def filter_values(self, filters: list[str]) -> None:
         self._filter_set[symbol(STREAM_FILTER_SPEC)] = Described(
             symbol(STREAM_FILTER_SPEC), filters
         )

rabbitmq_amqp_python_client/management.py

@@ -247,9 +247,9 @@ def _declare_stream(
 
         return body
 
-    def delete_exchange(self, exchange_name: str) -> None:
+    def delete_exchange(self, name: str) -> None:
         logger.debug("delete_exchange operation called")
-        path = AddressHelper.exchange_address(exchange_name)
+        path = AddressHelper.exchange_address(name)
 
         self.request(
             None,
@@ -260,9 +260,9 @@ def delete_exchange(self, exchange_name: str) -> None:
             ],
         )
 
-    def delete_queue(self, queue_name: str) -> None:
+    def delete_queue(self, name: str) -> None:
         logger.debug("delete_queue operation called")
-        path = AddressHelper.queue_address(queue_name)
+        path = AddressHelper.queue_address(name)
 
         self.request(
             None,
@@ -323,9 +323,9 @@ def unbind(self, binding_exchange_queue_path: str) -> None:
             ],
         )
 
-    def purge_queue(self, queue_name: str) -> int:
+    def purge_queue(self, name: str) -> int:
         logger.debug("purge_queue operation called")
-        path = AddressHelper.purge_queue_address(queue_name)
+        path = AddressHelper.purge_queue_address(name)
 
         response = self.request(
             None,
@@ -338,9 +338,9 @@ def purge_queue(self, queue_name: str) -> int:
 
         return int(response.body["message_count"])
 
-    def queue_info(self, queue_name: str) -> QueueInfo:
+    def queue_info(self, name: str) -> QueueInfo:
         logger.debug("queue_info operation called")
-        path = AddressHelper.queue_address(queue_name)
+        path = AddressHelper.queue_address(name)
 
         message = self.request(
             None,

tests/test_consumer.py

@@ -88,7 +88,7 @@ def test_consumer_async_queue_accept(connection: Connection) -> None:
     # we closed the connection so we need to open a new one
     connection_consumer = create_connection()
     consumer = connection_consumer.consumer(
-        addr_queue, handler=MyMessageHandlerAccept()
+        addr_queue, message_handler=MyMessageHandlerAccept()
     )
 
     try:
@@ -125,7 +125,9 @@ def test_consumer_async_queue_no_ack(connection: Connection) -> None:
     # we closed the connection so we need to open a new one
     connection_consumer = create_connection()
 
-    consumer = connection_consumer.consumer(addr_queue, handler=MyMessageHandlerNoack())
+    consumer = connection_consumer.consumer(
+        addr_queue, message_handler=MyMessageHandlerNoack()
+    )
 
     try:
         consumer.run()
@@ -172,7 +174,7 @@ def test_consumer_async_queue_with_discard(connection: Connection) -> None:
     connection_consumer = create_connection()
 
     consumer = connection_consumer.consumer(
-        addr_queue, handler=MyMessageHandlerDiscard()
+        addr_queue, message_handler=MyMessageHandlerDiscard()
     )
 
     try:
@@ -228,7 +230,7 @@ def test_consumer_async_queue_with_discard_with_annotations(
     connection_consumer = create_connection()
 
     consumer = connection_consumer.consumer(
-        addr_queue, handler=MyMessageHandlerDiscardWithAnnotations()
+        addr_queue, message_handler=MyMessageHandlerDiscardWithAnnotations()
     )
 
     try:
@@ -278,7 +280,7 @@ def test_consumer_async_queue_with_requeue(connection: Connection) -> None:
     connection_consumer = create_connection()
 
     consumer = connection_consumer.consumer(
-        addr_queue, handler=MyMessageHandlerRequeue()
+        addr_queue, message_handler=MyMessageHandlerRequeue()
     )
 
     try:
@@ -316,7 +318,7 @@ def test_consumer_async_queue_with_requeue_with_annotations(
     connection_consumer = create_connection()
 
     consumer = connection_consumer.consumer(
-        addr_queue, handler=MyMessageHandlerRequeueWithAnnotations()
+        addr_queue, message_handler=MyMessageHandlerRequeueWithAnnotations()
     )
 
     try:
@@ -363,7 +365,7 @@ def test_consumer_async_queue_with_requeue_with_invalid_annotations(
 
     try:
         consumer = connection_consumer.consumer(
-            addr_queue, handler=MyMessageHandlerRequeueWithInvalidAnnotations()
+            addr_queue, message_handler=MyMessageHandlerRequeueWithInvalidAnnotations()
         )
 
         consumer.run()

tests/test_management.py

@@ -82,7 +82,7 @@ def test_queue_info_with_validations(management: Management) -> None:
     )
     management.declare_queue(queue_specification)
 
-    queue_info = management.queue_info(queue_name=queue_name)
+    queue_info = management.queue_info(name=queue_name)
 
     management.delete_queue(queue_name)
 
@@ -101,7 +101,7 @@ def test_queue_info_for_stream_with_validations(management: Management) -> None:
     )
     management.declare_queue(queue_specification)
 
-    stream_info = management.queue_info(queue_name=stream_name)
+    stream_info = management.queue_info(name=stream_name)
 
     management.delete_queue(stream_name)