- Updated to new Builder.

- Renamed attributes broker_* to *.

issue #283

Author: albamig

packages/plugins/minos-broker-rabbitmq/minos/plugins/rabbitmq/__init__.py

@@ -2,6 +2,9 @@
 __email__ = "[email protected]"
 __version__ = "0.5.1"
 
+from .common import (
+    RabbitMQBrokerBuilderMixin
+)
 from .publisher import (
     InMemoryQueuedRabbitMQBrokerPublisher,
     PostgreSqlQueuedRabbitMQBrokerPublisher,

packages/plugins/minos-broker-rabbitmq/minos/plugins/rabbitmq/common.py

@@ -0,0 +1,28 @@
+from __future__ import (
+    annotations,
+)
+
+from minos.common import (
+    Builder,
+    Config,
+)
+
+
+class RabbitMQBrokerBuilderMixin(Builder):
+    """RabbitMQ Broker Builder Mixin class."""
+
+    def with_config(self, config: Config):
+        """Set config.
+
+        :param config: The config to be set.
+        :return: This method return the builder instance.
+        """
+        broker_config = config.get_interface_by_name("broker")
+        common_config = broker_config.get("common", dict())
+
+        self.kwargs |= {
+            "group_id": config.get_name(),
+            "host": common_config.get("host"),
+            "port": common_config.get("port"),
+        }
+        return super().with_config(config)

packages/plugins/minos-broker-rabbitmq/minos/plugins/rabbitmq/publisher.py

@@ -17,8 +17,9 @@
     BrokerPublisher,
     InMemoryBrokerPublisherQueue,
     PostgreSqlBrokerPublisherQueue,
-    QueuedBrokerPublisher,
+    QueuedBrokerPublisher, BrokerPublisherBuilder,
 )
+from minos.plugins.rabbitmq.common import RabbitMQBrokerBuilderMixin
 
 logger = logging.getLogger(__name__)
 
@@ -46,19 +47,19 @@ def _from_config(cls, config: MinosConfig, **kwargs) -> InMemoryQueuedRabbitMQBr
 class RabbitMQBrokerPublisher(BrokerPublisher):
     """RabbitMQ Broker Publisher class."""
 
-    def __init__(self, *args, broker_host: str, broker_port: int, **kwargs):
+    def __init__(self, *args, host: str, port: int, **kwargs):
         super().__init__(*args, **kwargs)
-        self.broker_host = broker_host
-        self.broker_port = broker_port
-
-    @classmethod
-    def _from_config(cls, config: MinosConfig, **kwargs) -> RabbitMQBrokerPublisher:
-        broker_config = config.get_interface_by_name("broker")
-        common_config = broker_config["common"]
-
-        kwargs["broker_host"] = common_config["host"]
-        kwargs["broker_port"] = common_config["port"]
-        return cls(**kwargs)
+        self.broker_host = host
+        self.broker_port = port
+
+    # @classmethod
+    # def _from_config(cls, config: MinosConfig, **kwargs) -> RabbitMQBrokerPublisher:
+    #     broker_config = config.get_interface_by_name("broker")
+    #     common_config = broker_config["common"]
+    #
+    #     kwargs["broker_host"] = common_config["host"]
+    #     kwargs["broker_port"] = common_config["port"]
+    #     return cls(**kwargs)
 
     async def _setup(self) -> None:
         await super()._setup()
@@ -72,3 +73,10 @@ async def _send(self, message: BrokerMessage) -> None:
             channel = await self.connection.channel()
             queue = await channel.declare_queue(message.topic)
             await channel.default_exchange.publish(Message(message.avro_bytes), routing_key=queue.name)
+
+
+class RabbitMQBrokerPublisherBuilder(BrokerPublisherBuilder[RabbitMQBrokerPublisher], RabbitMQBrokerBuilderMixin):
+    """RabbitMQ Broker Publisher Builder class."""
+
+
+RabbitMQBrokerPublisher.set_builder(RabbitMQBrokerPublisherBuilder)