Rename brokers and expose directly under protean package

proteanhq · Sep 26, 2020 · d263789 · d263789
1 parent bec09c7
commit d263789
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 19 deletions.
diff --git a/docs/blocks/ddd/aggregate.rst → docs/blocks/aggregate.rst b/docs/blocks/ddd/aggregate.rst → docs/blocks/aggregate.rst
diff --git a/docs/blocks/index.rst b/docs/blocks/index.rst
@@ -12,4 +12,5 @@ This section walks you through these mental models, and introduces the core fram
     :maxdepth: 1
     :glob:
 
-    ddd/*
+    aggregate
+    repository
diff --git a/docs/blocks/ddd/repository.rst → docs/blocks/repository.rst b/docs/blocks/ddd/repository.rst → docs/blocks/repository.rst
diff --git a/src/protean/__init__.py b/src/protean/__init__.py
@@ -5,4 +5,8 @@
 # Local/Relative Imports
 from .domain import Domain
 
-__all__ = ("Domain",)
+# Adapters
+from .adapters.broker.celery import CeleryBroker, ProteanTask
+from .adapters.broker.inline import InlineBroker
+
+__all__ = ("Domain", "CeleryBroker", "ProteanTask", "InlineBroker")
diff --git a/src/protean/adapters/broker/celery_broker.py → src/protean/adapters/broker/celery.py b/src/protean/adapters/broker/celery_broker.py → src/protean/adapters/broker/celery.py
diff --git a/src/protean/adapters/broker/inline_broker.py → src/protean/adapters/broker/inline.py b/src/protean/adapters/broker/inline_broker.py → src/protean/adapters/broker/inline.py
diff --git a/src/protean/domain/__init__.py b/src/protean/domain/__init__.py
@@ -44,7 +44,6 @@ class Domain(_PackageBoundObject):
     """
 
     # Protean
-    from protean.core.model import BaseModel
     from protean.utils import IdentityStrategy, IdentityType
 
     config_class = Config
@@ -93,11 +92,7 @@ class Domain(_PackageBoundObject):
                     "PROVIDER": "protean.adapters.repository.memory.MemoryProvider",
                 },
             },
-            "BROKERS": {
-                "default": {
-                    "PROVIDER": "protean.adapters.broker.inline_broker.InlineBroker",
-                },
-            },
+            "BROKERS": {"default": {"PROVIDER": "protean.InlineBroker",},},
             "EMAIL_PROVIDERS": {
                 "default": {
                     "PROVIDER": "protean.adapters.email.dummy.DummyEmailProvider",

diff --git a/tests/adapters/broker/celery_broker/config.py b/tests/adapters/broker/celery_broker/config.py
@@ -40,7 +40,7 @@
 # Messaging Mediums
 BROKERS = {
     "default": {
-        "PROVIDER": "protean.adapters.broker.celery_broker.CeleryBroker",
+        "PROVIDER": "protean.CeleryBroker",
         "URI": "redis://127.0.0.1:6379/2",
         "IS_ASYNC": True,
     },

diff --git a/tests/adapters/broker/celery_broker/test_subscriber.py b/tests/adapters/broker/celery_broker/test_subscriber.py
@@ -3,7 +3,7 @@
 
 from celery import Task
 from protean.globals import current_domain
-from protean.adapters.broker.celery_broker import CeleryBroker, ProteanTask
+from protean import CeleryBroker, ProteanTask
 from tests.adapters.broker.celery_broker.elements import NotifySSOSubscriber, Person
 
 

diff --git a/tests/adapters/broker/celery_broker/tests.py b/tests/adapters/broker/celery_broker/tests.py
@@ -3,7 +3,7 @@
 
 from mock import patch
 from protean.globals import current_domain
-from protean.adapters.broker.celery_broker import CeleryBroker
+from protean import CeleryBroker
 from tests.adapters.broker.celery_broker.elements import (
     NotifySSOSubscriber,
     Person,

diff --git a/tests/adapters/email/sendgrid_email/config.py b/tests/adapters/email/sendgrid_email/config.py
@@ -36,7 +36,7 @@
 
 # Messaging Mediums
 BROKERS = {
-    "default": {"PROVIDER": "protean.adapters.broker.inline_broker.InlineBroker"},
+    "default": {"PROVIDER": "protean.InlineBroker"},
 }
 
 EMAIL_PROVIDERS = {

diff --git a/tests/broker/tests.py b/tests/broker/tests.py
@@ -2,7 +2,7 @@
 import pytest
 
 from protean.port.broker import BaseBroker
-from protean.adapters.broker.inline_broker import InlineBroker
+from protean.adapters.broker.inline import InlineBroker
 
 
 class TestBroker:

diff --git a/tests/config.py b/tests/config.py
@@ -40,7 +40,7 @@
 
 # Messaging Mediums
 BROKERS = {
-    "default": {"PROVIDER": "protean.adapters.broker.inline_broker.InlineBroker"},
+    "default": {"PROVIDER": "protean.InlineBroker"},
 }
 
 EMAIL_PROVIDERS = {

diff --git a/tests/configuration/tests.py b/tests/configuration/tests.py
@@ -39,7 +39,7 @@ def test_config_repr(self):
             "'IDENTITY_STRATEGY': <IdentityStrategy.UUID: 1>, "
             "'IDENTITY_TYPE': <IdentityType.STRING: 'STRING'>, "
             "'DATABASES': {'default': {'PROVIDER': 'protean.adapters.repository.memory.MemoryProvider'}}, "
-            "'BROKERS': {'default': {'PROVIDER': 'protean.adapters.broker.inline_broker.InlineBroker'}}, "
+            "'BROKERS': {'default': {'PROVIDER': 'protean.InlineBroker'}}, "
             "'EMAIL_PROVIDERS': {'default': {'PROVIDER': 'protean.adapters.email.dummy.DummyEmailProvider', "
             "'DEFAULT_FROM_EMAIL': '[email protected]'}}, "
             "'AGGREGATE_CHILDREN_LIMIT': 100, "

diff --git a/tests/domain_event/tests.py b/tests/domain_event/tests.py
@@ -4,7 +4,7 @@
 from mock import patch
 from protean.core.domain_event import BaseDomainEvent
 from protean.globals import current_domain
-from protean.adapters.broker.inline_broker import InlineBroker
+from protean.adapters.broker.inline import InlineBroker
 from protean.infra.event_log import EventLog, EventLogRepository
 from protean.utils import fully_qualified_name
 

diff --git a/tests/identity/config_int.py b/tests/identity/config_int.py
@@ -23,5 +23,5 @@
 
 # Messaging Mediums
 BROKERS = {
-    "default": {"PROVIDER": "protean.adapters.broker.inline_broker.InlineBroker"},
+    "default": {"PROVIDER": "protean.InlineBroker"},
 }
diff --git a/tests/identity/config_string.py b/tests/identity/config_string.py
@@ -25,5 +25,5 @@
 
 # Messaging Mediums
 BROKERS = {
-    "default": {"PROVIDER": "protean.adapters.broker.inline_broker.InlineBroker"},
+    "default": {"PROVIDER": "protean.InlineBroker"},
 }
diff --git a/tests/identity/config_uuid.py b/tests/identity/config_uuid.py
@@ -25,5 +25,5 @@
 
 # Messaging Mediums
 BROKERS = {
-    "default": {"PROVIDER": "protean.adapters.broker.inline_broker.InlineBroker"},
+    "default": {"PROVIDER": "protean.InlineBroker"},
 }