Skip to content

Commit bfbe28b

Browse files
author
DanielePalaia
committed
some renaming
1 parent baa2372 commit bfbe28b

File tree

11 files changed

+51
-49
lines changed

11 files changed

+51
-49
lines changed

examples/getting_started/basic_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def main() -> None:
125125
print(
126126
"create a consumer and consume the test message - press control + c to terminate to consume"
127127
)
128-
consumer = connection.consumer(addr_queue, handler=MyMessageHandler())
128+
consumer = connection.consumer(addr_queue, message_handler=MyMessageHandler())
129129

130130
try:
131131
consumer.run()

examples/getting_started/example_with_streams.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ def main() -> None:
9090
# can be first, last, next or an offset long
9191
# you can also specify stream filters with methods: apply_filters and filter_match_unfiltered
9292
stream_filter_options.offset(OffsetSpecification.first)
93-
stream_filter_options.apply_filters(["banana"])
93+
stream_filter_options.filter_values(["banana"])
9494

9595
consumer = consumer_connection.consumer(
9696
addr_queue,
97-
handler=MyMessageHandler(),
97+
message_handler=MyMessageHandler(),
9898
stream_filter_options=stream_filter_options,
9999
)
100100
print(

examples/getting_started/reconnection_example.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def on_disconnection():
6161
if connection_configuration.consumer is not None:
6262
connection_configuration.consumer = (
6363
connection_configuration.connection.consumer(
64-
addr_queue, handler=MyMessageHandler()
64+
addr_queue, message_handler=MyMessageHandler()
6565
)
6666
)
6767

@@ -111,15 +111,15 @@ def on_link_closed(self, event: Event) -> None:
111111

112112

113113
def create_connection() -> Connection:
114-
# for multinode specify a list of urls and fill the field urls of Connection instead of url
115-
# urls = [
114+
# for multinode specify a list of urls and fill the field uris of Connection instead of url
115+
# uris = [
116116
# "amqp://ha_tls-rabbit_node0-1:5682/",
117117
# "amqp://ha_tls-rabbit_node1-1:5692/",
118118
# "amqp://ha_tls-rabbit_node2-1:5602/",
119119
# ]
120-
# connection = Connection(urls=urls, on_disconnection_handler=on_disconnected)
120+
# connection = Connection(uris=uris, on_disconnection_handler=on_disconnected)
121121
connection = Connection(
122-
url="amqp://guest:guest@localhost:5672/",
122+
uri="amqp://guest:guest@localhost:5672/",
123123
on_disconnection_handler=on_disconnection,
124124
)
125125
connection.dial()
@@ -207,7 +207,7 @@ def main() -> None:
207207
if connection_configuration.consumer is None:
208208
connection_configuration.consumer = (
209209
connection_configuration.connection.consumer(
210-
addr_queue, handler=MyMessageHandler()
210+
addr_queue, message_handler=MyMessageHandler()
211211
)
212212
)
213213

examples/getting_started/tls_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def main() -> None:
135135
print(
136136
"create a consumer and consume the test message - press control + c to terminate to consume"
137137
)
138-
consumer = connection.consumer(addr_queue, handler=MyMessageHandler())
138+
consumer = connection.consumer(addr_queue, message_handler=MyMessageHandler())
139139

140140
try:
141141
consumer.run()

rabbitmq_amqp_python_client/address_helper.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ def exchange_address(exchange_name: str, routing_key: str = "") -> str:
3838
return path
3939

4040
@staticmethod
41-
def queue_address(queue_name: str) -> str:
42-
path = "/queues/" + encode_path_segment(queue_name)
41+
def queue_address(name: str) -> str:
42+
path = "/queues/" + encode_path_segment(name)
4343

4444
return path
4545

4646
@staticmethod
47-
def purge_queue_address(queue_name: str) -> str:
48-
path = "/queues/" + encode_path_segment(queue_name) + "/messages"
47+
def purge_queue_address(name: str) -> str:
48+
path = "/queues/" + encode_path_segment(name) + "/messages"
4949

5050
return path
5151

rabbitmq_amqp_python_client/connection.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ class Connection:
2222
def __init__(
2323
self,
2424
# single-node mode
25-
url: Optional[str] = None,
25+
uri: Optional[str] = None,
2626
# multi-node mode
27-
urls: Optional[list[str]] = None,
27+
uris: Optional[list[str]] = None,
2828
ssl_context: Optional[SslConfigurationContext] = None,
2929
on_disconnection_handler: Optional[CB] = None, # type: ignore
3030
):
31-
if url is None and urls is None:
31+
if uri is None and uris is None:
3232
raise ValueError("You need to specify at least an addr or a list of addr")
33-
self._addr: Optional[str] = url
34-
self._addrs: Optional[list[str]] = urls
33+
self._addr: Optional[str] = uri
34+
self._addrs: Optional[list[str]] = uris
3535
self._conn: BlockingConnection
3636
self._management: Management
3737
self._on_disconnection_handler = on_disconnection_handler
@@ -87,7 +87,7 @@ def publisher(self, destination: str) -> Publisher:
8787
def consumer(
8888
self,
8989
destination: str,
90-
handler: Optional[MessagingHandler] = None,
90+
message_handler: Optional[MessagingHandler] = None,
9191
stream_filter_options: Optional[StreamOptions] = None,
9292
credit: Optional[int] = None,
9393
) -> Consumer:
@@ -96,6 +96,6 @@ def consumer(
9696
"destination address must start with /queues or /exchanges"
9797
)
9898
consumer = Consumer(
99-
self._conn, destination, handler, stream_filter_options, credit
99+
self._conn, destination, message_handler, stream_filter_options, credit
100100
)
101101
return consumer

rabbitmq_amqp_python_client/entities.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def offset(self, offset_spefication: Union[OffsetSpecification, int]) -> None:
6262
symbol(STREAM_OFFSET_SPEC), offset_spefication.name
6363
)
6464

65-
def apply_filters(self, filters: list[str]) -> None:
65+
def filter_values(self, filters: list[str]) -> None:
6666
self._filter_set[symbol(STREAM_FILTER_SPEC)] = Described(
6767
symbol(STREAM_FILTER_SPEC), filters
6868
)

rabbitmq_amqp_python_client/management.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,9 @@ def _declare_stream(
247247

248248
return body
249249

250-
def delete_exchange(self, exchange_name: str) -> None:
250+
def delete_exchange(self, name: str) -> None:
251251
logger.debug("delete_exchange operation called")
252-
path = AddressHelper.exchange_address(exchange_name)
252+
path = AddressHelper.exchange_address(name)
253253

254254
self.request(
255255
None,
@@ -260,9 +260,9 @@ def delete_exchange(self, exchange_name: str) -> None:
260260
],
261261
)
262262

263-
def delete_queue(self, queue_name: str) -> None:
263+
def delete_queue(self, name: str) -> None:
264264
logger.debug("delete_queue operation called")
265-
path = AddressHelper.queue_address(queue_name)
265+
path = AddressHelper.queue_address(name)
266266

267267
self.request(
268268
None,
@@ -323,9 +323,9 @@ def unbind(self, binding_exchange_queue_path: str) -> None:
323323
],
324324
)
325325

326-
def purge_queue(self, queue_name: str) -> int:
326+
def purge_queue(self, name: str) -> int:
327327
logger.debug("purge_queue operation called")
328-
path = AddressHelper.purge_queue_address(queue_name)
328+
path = AddressHelper.purge_queue_address(name)
329329

330330
response = self.request(
331331
None,
@@ -338,9 +338,9 @@ def purge_queue(self, queue_name: str) -> int:
338338

339339
return int(response.body["message_count"])
340340

341-
def queue_info(self, queue_name: str) -> QueueInfo:
341+
def queue_info(self, name: str) -> QueueInfo:
342342
logger.debug("queue_info operation called")
343-
path = AddressHelper.queue_address(queue_name)
343+
path = AddressHelper.queue_address(name)
344344

345345
message = self.request(
346346
None,

tests/test_consumer.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def test_consumer_async_queue_accept(connection: Connection) -> None:
8888
# we closed the connection so we need to open a new one
8989
connection_consumer = create_connection()
9090
consumer = connection_consumer.consumer(
91-
addr_queue, handler=MyMessageHandlerAccept()
91+
addr_queue, message_handler=MyMessageHandlerAccept()
9292
)
9393

9494
try:
@@ -125,7 +125,9 @@ def test_consumer_async_queue_no_ack(connection: Connection) -> None:
125125
# we closed the connection so we need to open a new one
126126
connection_consumer = create_connection()
127127

128-
consumer = connection_consumer.consumer(addr_queue, handler=MyMessageHandlerNoack())
128+
consumer = connection_consumer.consumer(
129+
addr_queue, message_handler=MyMessageHandlerNoack()
130+
)
129131

130132
try:
131133
consumer.run()
@@ -172,7 +174,7 @@ def test_consumer_async_queue_with_discard(connection: Connection) -> None:
172174
connection_consumer = create_connection()
173175

174176
consumer = connection_consumer.consumer(
175-
addr_queue, handler=MyMessageHandlerDiscard()
177+
addr_queue, message_handler=MyMessageHandlerDiscard()
176178
)
177179

178180
try:
@@ -228,7 +230,7 @@ def test_consumer_async_queue_with_discard_with_annotations(
228230
connection_consumer = create_connection()
229231

230232
consumer = connection_consumer.consumer(
231-
addr_queue, handler=MyMessageHandlerDiscardWithAnnotations()
233+
addr_queue, message_handler=MyMessageHandlerDiscardWithAnnotations()
232234
)
233235

234236
try:
@@ -278,7 +280,7 @@ def test_consumer_async_queue_with_requeue(connection: Connection) -> None:
278280
connection_consumer = create_connection()
279281

280282
consumer = connection_consumer.consumer(
281-
addr_queue, handler=MyMessageHandlerRequeue()
283+
addr_queue, message_handler=MyMessageHandlerRequeue()
282284
)
283285

284286
try:
@@ -316,7 +318,7 @@ def test_consumer_async_queue_with_requeue_with_annotations(
316318
connection_consumer = create_connection()
317319

318320
consumer = connection_consumer.consumer(
319-
addr_queue, handler=MyMessageHandlerRequeueWithAnnotations()
321+
addr_queue, message_handler=MyMessageHandlerRequeueWithAnnotations()
320322
)
321323

322324
try:
@@ -363,7 +365,7 @@ def test_consumer_async_queue_with_requeue_with_invalid_annotations(
363365

364366
try:
365367
consumer = connection_consumer.consumer(
366-
addr_queue, handler=MyMessageHandlerRequeueWithInvalidAnnotations()
368+
addr_queue, message_handler=MyMessageHandlerRequeueWithInvalidAnnotations()
367369
)
368370

369371
consumer.run()

tests/test_management.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def test_queue_info_with_validations(management: Management) -> None:
8282
)
8383
management.declare_queue(queue_specification)
8484

85-
queue_info = management.queue_info(queue_name=queue_name)
85+
queue_info = management.queue_info(name=queue_name)
8686

8787
management.delete_queue(queue_name)
8888

@@ -101,7 +101,7 @@ def test_queue_info_for_stream_with_validations(management: Management) -> None:
101101
)
102102
management.declare_queue(queue_specification)
103103

104-
stream_info = management.queue_info(queue_name=stream_name)
104+
stream_info = management.queue_info(name=stream_name)
105105

106106
management.delete_queue(stream_name)
107107

0 commit comments

Comments
 (0)