reverting examples

Author: DanielePalaia

examples/getting_started/getting_started.py

@@ -3,13 +3,13 @@
 
 from rabbitmq_amqp_python_client import (  # SSlConfigurationContext,; SslConfigurationContext,; ClientCert,
     AddressHelper,
-    AmqpMessage,
     AMQPMessagingHandler,
     BindingSpecification,
     Connection,
     Environment,
     Event,
     ExchangeSpecification,
+    Message,
     OutcomeState,
     QuorumQueueSpecification,
 )
@@ -125,7 +125,7 @@ def main() -> None:
     # publish 10 messages
     for i in range(MESSAGES_TO_PUBLISH):
         print("publishing")
-        status = publisher.publish(AmqpMessage(body="test"))
+        status = publisher.publish(Message(body="test"))
         if status.remote_state == OutcomeState.ACCEPTED:
             print("message accepted")
         elif status.remote_state == OutcomeState.RELEASED:

examples/reconnection/reconnection_example.py

@@ -7,7 +7,6 @@
 
 from rabbitmq_amqp_python_client import (
     AddressHelper,
-    AmqpMessage,
     AMQPMessagingHandler,
     BindingSpecification,
     Connection,
@@ -17,6 +16,7 @@
     Event,
     ExchangeSpecification,
     Management,
+    Message,
     Publisher,
     QuorumQueueSpecification,
 )
@@ -191,7 +191,7 @@ def main() -> None:
                 print("published 1000 messages...")
             try:
                 if connection_configuration.publisher is not None:
-                    connection_configuration.publisher.publish(AmqpMessage(body="test"))
+                    connection_configuration.publisher.publish(Message(body="test"))
             except ConnectionClosed:
                 print("publisher closing exception, resubmitting")
                 continue

examples/streams/example_with_streams.py

@@ -2,11 +2,11 @@
 
 from rabbitmq_amqp_python_client import (  # SSlConfigurationContext,; SslConfigurationContext,; ClientCert,
     AddressHelper,
-    AmqpMessage,
     AMQPMessagingHandler,
     Connection,
     Environment,
     Event,
+    Message,
     OffsetSpecification,
     StreamOptions,
     StreamSpecification,
@@ -120,15 +120,15 @@ def main() -> None:
     # publish with a filter of apple
     for i in range(MESSAGES_TO_PUBLISH):
         publisher.publish(
-            AmqpMessage(
+            Message(
                 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(
-            AmqpMessage(
+            Message(
                 body="banana: " + str(i),
                 annotations={"x-stream-filter-value": "banana"},
             )

examples/tls/tls_example.py

@@ -3,14 +3,14 @@
 
 from rabbitmq_amqp_python_client import (  # SSlConfigurationContext,; SslConfigurationContext,; ClientCert,
     AddressHelper,
-    AmqpMessage,
     AMQPMessagingHandler,
     BindingSpecification,
     ClientCert,
     Connection,
     Environment,
     Event,
     ExchangeSpecification,
+    Message,
     QuorumQueueSpecification,
     SslConfigurationContext,
 )
@@ -124,7 +124,7 @@ def main() -> None:
 
     # publish 10 messages
     for i in range(messages_to_publish):
-        status = publisher.publish(AmqpMessage(body="test"))
+        status = publisher.publish(Message(body="test"))
         if status.ACCEPTED:
             print("message accepted")
         elif status.RELEASED:

rabbitmq_amqp_python_client/__init__.py

@@ -69,5 +69,4 @@
     "OffsetSpecification",
     "OutcomeState",
     "Environment",
-    "message_to_address_helper",
 ]