naming conventions

Author: DanielePalaia

rabbitmq_amqp_python_client/__init__.py

@@ -9,7 +9,7 @@
     BindingSpecification,
     ExchangeSpecification,
     OffsetSpecification,
-    StreamFilterOptions,
+    StreamOptions,
 )
 from .exceptions import ArgumentOutOfRangeException
 from .management import Management
@@ -63,6 +63,6 @@
     "ClientCert",
     "Delivery",
     "ConnectionClosed",
-    "StreamFilterOptions",
+    "StreamOptions",
     "OffsetSpecification",
 ]

rabbitmq_amqp_python_client/connection.py

@@ -3,7 +3,7 @@
 
 from .address_helper import validate_address
 from .consumer import Consumer
-from .entities import StreamFilterOptions
+from .entities import StreamOptions
 from .exceptions import ArgumentOutOfRangeException
 from .management import Management
 from .publisher import Publisher
@@ -88,7 +88,7 @@ def consumer(
         self,
         destination: str,
         handler: Optional[MessagingHandler] = None,
-        stream_filter_options: Optional[StreamFilterOptions] = None,
+        stream_filter_options: Optional[StreamOptions] = None,
     ) -> Consumer:
         if validate_address(destination) is False:
             raise ArgumentOutOfRangeException(

rabbitmq_amqp_python_client/consumer.py

@@ -1,7 +1,7 @@
 import logging
 from typing import Literal, Optional, Union
 
-from .entities import StreamFilterOptions
+from .entities import StreamOptions
 from .options import (
     ReceiverOptionUnsettled,
     ReceiverOptionUnsettledWithFilters,
@@ -22,7 +22,7 @@ def __init__(
         conn: BlockingConnection,
         addr: str,
         handler: Optional[MessagingHandler] = None,
-        stream_options: Optional[StreamFilterOptions] = None,
+        stream_options: Optional[StreamOptions] = None,
     ):
         self._receiver: Optional[BlockingReceiver] = None
         self._conn = conn

rabbitmq_amqp_python_client/entities.py

@@ -47,7 +47,7 @@ class BindingSpecification:
     binding_key: str
 
 
-class StreamFilterOptions:
+class StreamOptions:
 
     def __init__(self):  # type: ignore
         self._filter_set: Dict[symbol, Described] = {}

rabbitmq_amqp_python_client/options.py

@@ -1,4 +1,4 @@
-from .entities import StreamFilterOptions
+from .entities import StreamOptions
 from .qpid.proton._data import (  # noqa: E402
     PropertyDict,
     symbol,
@@ -68,7 +68,7 @@ def test(self, link: Link) -> bool:
 
 
 class ReceiverOptionUnsettledWithFilters(Filter):  # type: ignore
-    def __init__(self, addr: str, filter_options: StreamFilterOptions):
+    def __init__(self, addr: str, filter_options: StreamOptions):
         super().__init__(filter_options.filter_set())
         self._addr = addr
 

tests/test_streams.py

@@ -2,7 +2,7 @@
     AddressHelper,
     Connection,
     OffsetSpecification,
-    StreamFilterOptions,
+    StreamOptions,
     StreamSpecification,
 )
 
@@ -58,7 +58,7 @@ def test_stream_read_from_last(connection: Connection) -> None:
 
     addr_queue = AddressHelper.queue_address(stream_name)
 
-    stream_filter_options = StreamFilterOptions()
+    stream_filter_options = StreamOptions()
     stream_filter_options.offset(OffsetSpecification.last)
 
     # consume and then publish
@@ -97,7 +97,7 @@ def test_stream_read_from_offset_zero(connection: Connection) -> None:
     # publish and then consume
     publish_messages(connection, messages_to_send, stream_name)
 
-    stream_filter_options = StreamFilterOptions()
+    stream_filter_options = StreamOptions()
     stream_filter_options.offset(0)
 
     try:
@@ -135,7 +135,7 @@ def test_stream_read_from_offset_first(connection: Connection) -> None:
     # publish and then consume
     publish_messages(connection, messages_to_send, stream_name)
 
-    stream_filter_options = StreamFilterOptions()
+    stream_filter_options = StreamOptions()
     stream_filter_options.offset(OffsetSpecification.first)
 
     try:
@@ -173,7 +173,7 @@ def test_stream_read_from_offset_ten(connection: Connection) -> None:
     # publish and then consume
     publish_messages(connection, messages_to_send, stream_name)
 
-    stream_filter_options = StreamFilterOptions()
+    stream_filter_options = StreamOptions()
     stream_filter_options.offset(10)
 
     try:
@@ -211,7 +211,7 @@ def test_stream_filtering(connection: Connection) -> None:
 
     # consume and then publish
     try:
-        stream_filter_options = StreamFilterOptions()
+        stream_filter_options = StreamOptions()
         stream_filter_options.apply_filters(["banana"])
         connection_consumer = create_connection()
         consumer = connection_consumer.consumer(
@@ -246,7 +246,7 @@ def test_stream_filtering_not_present(connection: Connection) -> None:
     addr_queue = AddressHelper.queue_address(stream_name)
 
     # consume and then publish
-    stream_filter_options = StreamFilterOptions()
+    stream_filter_options = StreamOptions()
     stream_filter_options.apply_filters(["apple"])
     connection_consumer = create_connection()
     consumer = connection_consumer.consumer(
@@ -284,7 +284,7 @@ def test_stream_match_unfiltered(connection: Connection) -> None:
 
     # consume and then publish
     try:
-        stream_filter_options = StreamFilterOptions()
+        stream_filter_options = StreamOptions()
         stream_filter_options.apply_filters(["banana"])
         stream_filter_options.filter_match_unfiltered(True)
         connection_consumer = create_connection()