formatting

Author: Gsantomaggio

README.md

@@ -149,7 +149,7 @@ You can check the [`ssl example`](./examples/tls/tls_example.py) to see how to e
 
 The client supports oauth2 authentication.
 
-You can check the [`oauth2 example`](./examples/oauth/oaut.py) to see how to establish and refresh a connection using an oauth2 token
+You can check the [`oauth2 example`](examples/oauth/oAuth2.py) to see how to establish and refresh a connection using an oauth2 token
 
 ### Managing disconnections
 

examples/README.md

@@ -4,4 +4,4 @@ Client examples
  - [Reconnection](./reconnection/reconnection_example.py) - Producer and Consumer example with reconnection
  - [TLS](./tls/tls_example.py) - Producer and Consumer using a TLS connection
  - [Streams](./streams/example_with_streams.py) - Example supporting stream capabilities
- - [Oauth](./oauth/oauth.py) - Connection through Oauth token
+ - [Oauth](./oauth/oAuth2.py) - Connection through Oauth token

examples/getting_started/getting_started.py

@@ -5,14 +5,14 @@
     AddressHelper,
     AMQPMessagingHandler,
     Connection,
-    Converter,
     Environment,
     Event,
     ExchangeSpecification,
     ExchangeToQueueBindingSpecification,
     Message,
     OutcomeState,
     QuorumQueueSpecification,
+    Converter,
 )
 
 MESSAGES_TO_PUBLISH = 100

examples/oauth/oaut.py renamed to examples/oauth/oAuth2.py

@@ -86,9 +86,9 @@ def create_connection(environment: Environment) -> Connection:
 
 
 def main() -> None:
-    exchange_name = "test-exchange"
-    queue_name = "example-queue"
-    routing_key = "routing-key"
+    exchange_name = "oAuth2-test-exchange"
+    queue_name = "oAuth2-example-queue"
+    routing_key = "oAuth2-routing-key"
 
     print("connection to amqp server")
     oaut_token = token(

examples/streams/example_with_streams.py

@@ -11,6 +11,7 @@
     OffsetSpecification,
     StreamOptions,
     StreamSpecification,
+    Converter,
 )
 
 MESSAGES_TO_PUBLISH = 100
@@ -26,7 +27,7 @@ def on_amqp_message(self, event: Event):
         # just messages with banana filters get received
         print(
             "received message from stream: "
-            + str(event.message.body)
+            + Converter.bytes_to_string(event.message.body)
             + " with offset: "
             + str(event.message.annotations["x-stream-offset"])
         )
@@ -118,15 +119,16 @@ def main() -> None:
     for i in range(MESSAGES_TO_PUBLISH):
         publisher.publish(
             Message(
-                body="apple: " + str(i), annotations={"x-stream-filter-value": "apple"}
+                Converter.string_to_bytes(body="apple: " + str(i)),
+                annotations={"x-stream-filter-value": "apple"},
             )
         )
 
     # publish with a filter of banana
     for i in range(MESSAGES_TO_PUBLISH):
         publisher.publish(
             Message(
-                body="banana: " + str(i),
+                body=Converter.string_to_bytes("banana: " + str(i)),
                 annotations={"x-stream-filter-value": "banana"},
             )
         )

examples/tls/tls_example.py

@@ -81,9 +81,9 @@ def create_connection(environment: Environment) -> Connection:
 
 
 def main() -> None:
-    exchange_name = "test-exchange"
-    queue_name = "example-queue"
-    routing_key = "routing-key"
+    exchange_name = "tls-test-exchange"
+    queue_name = "tls-example-queue"
+    routing_key = "tls-routing-key"
     ca_p12_store = ".ci/certs/ca.p12"
     ca_cert_file = ".ci/certs/ca_certificate.pem"
     client_cert = ".ci/certs/client_localhost_certificate.pem"

rabbitmq_amqp_python_client/__init__.py

@@ -15,6 +15,8 @@
     RecoveryConfiguration,
     StreamOptions,
 )
+
+from .utils import Converter
 from .environment import Environment
 from .exceptions import (
     ArgumentOutOfRangeException,
@@ -91,4 +93,5 @@
     "ExchangeCustomSpecification",
     "RecoveryConfiguration",
     "OAuth2Options",
+    "Converter",
 ]

rabbitmq_amqp_python_client/utils.py

@@ -9,19 +9,6 @@ def validate_annotations(annotations: []) -> bool:  # type: ignore
     return validated
 
 
-def string_to_bytes(body: str) -> bytes:
-    """
-    Convert a string to the body of a message.
-
-    Args:
-        body: The string to convert
-
-    Returns:
-        bytes: The byte representation of the string
-    """
-    return str.encode(body)
-
-
 class Converter:
 
     @staticmethod