Skip to content

Commit 64c9424

Browse files
author
Sergio García Prado
committed
* Rename BrokerHandlerPort as BrokerPort.
* Rename `PeriodicTaskSchedulerPort` as `PeriodicPort`.
1 parent 3776aff commit 64c9424

File tree

14 files changed

+37
-38
lines changed

14 files changed

+37
-38
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ databases:
176176
path: "./foo.lmdb"
177177
interfaces:
178178
broker:
179-
port: minos.networks.BrokerHandlerPort
179+
port: minos.networks.BrokerPort
180180
publisher:
181181
client: minos.plugins.kafka.KafkaBrokerPublisher
182182
queue: minos.networks.PostgreSqlBrokerPublisherQueue
@@ -190,7 +190,7 @@ interfaces:
190190
client: minos.plugins.aiohttp.AioHttpConnector
191191
port: 4545
192192
periodic:
193-
port: minos.networks.PeriodicTaskSchedulerPort
193+
port: minos.networks.PeriodicPort
194194
pools:
195195
lock: minos.common.PostgreSqlLockPool
196196
databasse: minos.common.PostgreSqlPool
@@ -992,7 +992,7 @@ databases:
992992
path: "./foobar.lmdb"
993993
interfaces:
994994
broker:
995-
port: minos.networks.BrokerHandlerPort
995+
port: minos.networks.BrokerPort
996996
publisher:
997997
client: minos.plugins.kafka.KafkaBrokerPublisher
998998
queue: minos.networks.PostgreSqlBrokerPublisherQueue
@@ -1006,7 +1006,7 @@ interfaces:
10061006
client: minos.plugins.aiohttp.AioHttpConnector
10071007
port: 4546
10081008
periodic:
1009-
port: minos.networks.PeriodicTaskSchedulerPort
1009+
port: minos.networks.PeriodicPort
10101010
pools:
10111011
lock: minos.common.PostgreSqlLockPool
10121012
databasse: minos.common.PostgreSqlPool

packages/core/minos-microservice-networks/minos/networks/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
BrokerClientPool,
1010
BrokerDispatcher,
1111
BrokerHandler,
12-
BrokerHandlerPort,
12+
BrokerPort,
1313
BrokerHandlerService,
1414
BrokerMessage,
1515
BrokerMessageV1,
@@ -123,7 +123,7 @@
123123
CronTab,
124124
PeriodicTask,
125125
PeriodicTaskScheduler,
126-
PeriodicTaskSchedulerPort,
126+
PeriodicPort,
127127
PeriodicTaskSchedulerService,
128128
ScheduledRequest,
129129
ScheduledRequestContent,

packages/core/minos-microservice-networks/minos/networks/brokers/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
)
1616
from .handlers import (
1717
BrokerHandler,
18-
BrokerHandlerPort,
18+
BrokerPort,
1919
BrokerHandlerService,
2020
)
2121
from .messages import (

packages/core/minos-microservice-networks/minos/networks/brokers/handlers/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
BrokerHandler,
33
)
44
from .ports import (
5-
BrokerHandlerPort,
5+
BrokerPort,
66
BrokerHandlerService,
77
)

packages/core/minos-microservice-networks/minos/networks/brokers/handlers/ports.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
logger = logging.getLogger(__name__)
1717

1818

19-
class BrokerHandlerPort(Port):
20-
"""Broker Handler Service class."""
19+
class BrokerPort(Port):
20+
"""Broker Port class."""
2121

2222
def __init__(self, **kwargs):
2323
super().__init__(**kwargs)
@@ -45,11 +45,11 @@ def handler(self) -> BrokerHandler:
4545
return BrokerHandler.from_config(**self._init_kwargs)
4646

4747

48-
class BrokerHandlerService(BrokerHandlerPort):
48+
class BrokerHandlerService(BrokerPort):
4949
"""Broker Handler Service class."""
5050

5151
def __init__(self, **kwargs):
5252
warnings.warn(
53-
f"{BrokerHandlerService!r} has been deprecated. Use {BrokerHandlerPort} instead.", DeprecationWarning
53+
f"{BrokerHandlerService!r} has been deprecated. Use {BrokerPort} instead.", DeprecationWarning
5454
)
5555
super().__init__(**kwargs)

packages/core/minos-microservice-networks/minos/networks/scheduling/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
CronTab,
33
)
44
from .ports import (
5-
PeriodicTaskSchedulerPort,
5+
PeriodicPort,
66
PeriodicTaskSchedulerService,
77
)
88
from .requests import (

packages/core/minos-microservice-networks/minos/networks/scheduling/ports.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
logger = logging.getLogger(__name__)
1717

1818

19-
class PeriodicTaskSchedulerPort(Port):
20-
"""Task Scheduler Service class."""
19+
class PeriodicPort(Port):
20+
"""Periodic Port class."""
2121

2222
def __init__(self, **kwargs):
2323
super().__init__(**kwargs)
@@ -46,12 +46,12 @@ def scheduler(self) -> PeriodicTaskScheduler:
4646
return PeriodicTaskScheduler.from_config(**self._init_kwargs)
4747

4848

49-
class PeriodicTaskSchedulerService(PeriodicTaskSchedulerPort):
49+
class PeriodicTaskSchedulerService(PeriodicPort):
5050
"""Periodic Task Scheduler Service class."""
5151

5252
def __init__(self, **kwargs):
5353
warnings.warn(
54-
f"{PeriodicTaskSchedulerService!r} has been deprecated. Use {PeriodicTaskSchedulerPort} instead.",
54+
f"{PeriodicTaskSchedulerService!r} has been deprecated. Use {PeriodicPort} instead.",
5555
DeprecationWarning,
5656
)
5757
super().__init__(**kwargs)

packages/core/minos-microservice-networks/tests/test_config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ service:
33
aggregate: tests.utils.Order
44
services:
55
- minos.networks.HttpPort
6-
- minos.networks.BrokerHandlerPort
7-
- minos.networks.PeriodicTaskSchedulerPort
6+
- minos.networks.BrokerPort
7+
- minos.networks.PeriodicPort
88
routers:
99
- minos.networks.BrokerRouter
1010
- minos.networks.PeriodicRouter

packages/core/minos-microservice-networks/tests/test_networks/test_brokers/test_handlers/test_ports.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
)
1313
from minos.networks import (
1414
BrokerHandler,
15-
BrokerHandlerPort,
15+
BrokerPort,
1616
BrokerHandlerService,
1717
InMemoryBrokerPublisher,
1818
InMemoryBrokerSubscriberBuilder,
@@ -22,7 +22,7 @@
2222
)
2323

2424

25-
class TestBrokerHandlerPort(PostgresAsyncTestCase):
25+
class TestBrokerPort(PostgresAsyncTestCase):
2626
CONFIG_FILE_PATH = CONFIG_FILE_PATH
2727

2828
def setUp(self) -> None:
@@ -31,17 +31,17 @@ def setUp(self) -> None:
3131
self.subscriber_builder = InMemoryBrokerSubscriberBuilder()
3232

3333
def test_is_instance(self):
34-
service = BrokerHandlerPort(config=self.config, publisher=self.publisher)
34+
service = BrokerPort(config=self.config, publisher=self.publisher)
3535
self.assertIsInstance(service, Port)
3636

3737
def test_handler(self):
38-
service = BrokerHandlerPort(
38+
service = BrokerPort(
3939
config=self.config, publisher=self.publisher, subscriber_builder=self.subscriber_builder
4040
)
4141
self.assertIsInstance(service.handler, BrokerHandler)
4242

4343
async def test_start_stop(self):
44-
service = BrokerHandlerPort(
44+
service = BrokerPort(
4545
config=self.config, publisher=self.publisher, subscriber_builder=self.subscriber_builder
4646
)
4747

@@ -72,13 +72,13 @@ async def test_start_stop(self):
7272

7373
class TestBrokerHandlerService(unittest.TestCase):
7474
def test_is_subclass(self):
75-
self.assertTrue(issubclass(BrokerHandlerService, BrokerHandlerPort))
75+
self.assertTrue(issubclass(BrokerHandlerService, BrokerPort))
7676

7777
def test_warnings(self):
7878
with warnings.catch_warnings():
7979
warnings.simplefilter("ignore", DeprecationWarning)
8080
port = BrokerHandlerService(config=CONFIG_FILE_PATH)
81-
self.assertIsInstance(port, BrokerHandlerPort)
81+
self.assertIsInstance(port, BrokerPort)
8282

8383

8484
if __name__ == "__main__":

packages/core/minos-microservice-networks/tests/test_networks/test_scheduling/test_ports.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,27 @@
1212
)
1313
from minos.networks import (
1414
PeriodicTaskScheduler,
15-
PeriodicTaskSchedulerPort,
15+
PeriodicPort,
1616
PeriodicTaskSchedulerService,
1717
)
1818
from tests.utils import (
1919
CONFIG_FILE_PATH,
2020
)
2121

2222

23-
class TestPeriodicTaskSchedulerPort(PostgresAsyncTestCase):
23+
class TestPeriodicPort(PostgresAsyncTestCase):
2424
CONFIG_FILE_PATH = CONFIG_FILE_PATH
2525

2626
def test_is_instance(self):
27-
service = PeriodicTaskSchedulerPort(config=self.config)
27+
service = PeriodicPort(config=self.config)
2828
self.assertIsInstance(service, Port)
2929

3030
def test_dispatcher(self):
31-
service = PeriodicTaskSchedulerPort(config=self.config)
31+
service = PeriodicPort(config=self.config)
3232
self.assertIsInstance(service.scheduler, PeriodicTaskScheduler)
3333

3434
async def test_start_stop(self):
35-
service = PeriodicTaskSchedulerPort(config=self.config)
35+
service = PeriodicPort(config=self.config)
3636

3737
setup_mock = AsyncMock()
3838
destroy_mock = AsyncMock()
@@ -66,13 +66,13 @@ async def test_start_stop(self):
6666

6767
class TestPeriodicTaskSchedulerService(unittest.TestCase):
6868
def test_is_subclass(self):
69-
self.assertTrue(issubclass(PeriodicTaskSchedulerService, PeriodicTaskSchedulerPort))
69+
self.assertTrue(issubclass(PeriodicTaskSchedulerService, PeriodicPort))
7070

7171
def test_warnings(self):
7272
with warnings.catch_warnings():
7373
warnings.simplefilter("ignore", DeprecationWarning)
7474
port = PeriodicTaskSchedulerService(config=CONFIG_FILE_PATH)
75-
self.assertIsInstance(port, PeriodicTaskSchedulerPort)
75+
self.assertIsInstance(port, PeriodicPort)
7676

7777

7878
if __name__ == "__main__":

0 commit comments

Comments
 (0)