- Fixed tests.

issue #283

Author: albamig

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

@@ -3,16 +3,13 @@
 __version__ = "0.5.1"
 
 from .common import (
-    RabbitMQBrokerBuilderMixin
+    RabbitMQBrokerBuilderMixin,
 )
 from .publisher import (
-    InMemoryQueuedRabbitMQBrokerPublisher,
-    PostgreSqlQueuedRabbitMQBrokerPublisher,
     RabbitMQBrokerPublisher,
+    RabbitMQBrokerPublisherBuilder,
 )
 from .subscriber import (
-    InMemoryQueuedRabbitMQBrokerSubscriberBuilder,
-    PostgreSqlQueuedRabbitMQBrokerSubscriberBuilder,
     RabbitMQBrokerSubscriber,
     RabbitMQBrokerSubscriberBuilder,
 )

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

@@ -9,61 +9,29 @@
     connect,
 )
 
-from minos.common import (
-    MinosConfig,
-)
 from minos.networks import (
     BrokerMessage,
     BrokerPublisher,
-    InMemoryBrokerPublisherQueue,
-    PostgreSqlBrokerPublisherQueue,
-    QueuedBrokerPublisher, BrokerPublisherBuilder,
+    BrokerPublisherBuilder,
+)
+from minos.plugins.rabbitmq.common import (
+    RabbitMQBrokerBuilderMixin,
 )
-from minos.plugins.rabbitmq.common import RabbitMQBrokerBuilderMixin
 
 logger = logging.getLogger(__name__)
 
 
-class PostgreSqlQueuedRabbitMQBrokerPublisher(QueuedBrokerPublisher):
-    """PostgreSql Queued RabbitMQ Broker Publisher class."""
-
-    @classmethod
-    def _from_config(cls, config: MinosConfig, **kwargs) -> PostgreSqlQueuedRabbitMQBrokerPublisher:
-        impl = RabbitMQBrokerPublisher.from_config(config, **kwargs)
-        queue = PostgreSqlBrokerPublisherQueue.from_config(config, **kwargs)
-        return cls(impl, queue, **kwargs)
-
-
-class InMemoryQueuedRabbitMQBrokerPublisher(QueuedBrokerPublisher):
-    """In Memory Queued RabbitMQ Broker Publisher class."""
-
-    @classmethod
-    def _from_config(cls, config: MinosConfig, **kwargs) -> InMemoryQueuedRabbitMQBrokerPublisher:
-        impl = RabbitMQBrokerPublisher.from_config(config, **kwargs)
-        queue = InMemoryBrokerPublisherQueue.from_config(config, **kwargs)
-        return cls(impl, queue, **kwargs)
-
-
 class RabbitMQBrokerPublisher(BrokerPublisher):
     """RabbitMQ Broker Publisher class."""
 
     def __init__(self, *args, host: str, port: int, **kwargs):
         super().__init__(*args, **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)
+        self.host = host
+        self.port = port
 
     async def _setup(self) -> None:
         await super()._setup()
-        self.connection = await connect(f"amqp://guest:guest@{self.broker_host}:{self.broker_port}/")
+        self.connection = await connect(f"amqp://guest:guest@{self.host}:{self.port}/")
 
     async def _destroy(self) -> None:
         await self.connection.close()