Revert "configurator, bmqit: mode protos (#447)" (#449)

This reverts commit a4b20db.

Author: dorjesinpo

src/python/blazingmq/dev/configurator/__init__.py

@@ -216,24 +216,27 @@ def domain(self, parameters: mqbconf.Domain) -> "Domain":
         return self._add_domain(Domain(self, domain))
 
     def broadcast_domain(self, name: str) -> "Domain":
-        parameters = self.configurator.broadcast_domain()
+        parameters = self.configurator.domain_definition()
         parameters.name = name
+        parameters.mode = mqbconf.QueueMode(broadcast=mqbconf.QueueModeBroadcast())
         parameters.storage.config.in_memory = mqbconf.InMemoryStorage()
         parameters.storage.config.file_backed = None
         domain = mqbconf.DomainDefinition(self.name, parameters)
 
         return self._add_domain(Domain(self, domain))
 
     def fanout_domain(self, name: str, app_ids: List[str]) -> "Domain":
-        parameters = self.configurator.fanout_domain()
+        parameters = self.configurator.domain_definition()
         parameters.name = name
+        parameters.mode = mqbconf.QueueMode(fanout=mqbconf.QueueModeFanout([*app_ids]))
         domain = mqbconf.DomainDefinition(self.name, parameters)
 
         return self._add_domain(Domain(self, domain))
 
     def priority_domain(self, name: str) -> "Domain":
-        parameters = self.configurator.priority_domain()
+        parameters = self.configurator.domain_definition()
         parameters.name = name
+        parameters.mode = mqbconf.QueueMode(priority=mqbconf.QueueModePriority())
         domain = mqbconf.DomainDefinition(self.name, parameters)
 
         return self._add_domain(Domain(self, domain))
@@ -311,11 +314,6 @@ class Proto:
     domain: mqbconf.Domain = field(
         default_factory=functools.partial(
             mqbconf.Domain,
-            mode=mqbconf.QueueMode(
-                broadcast=mqbconf.QueueModeBroadcast(),
-                fanout=mqbconf.QueueModeFanout(),
-                priority=mqbconf.QueueModePriority(),
-            ),
             max_delivery_attempts=0,
             deduplication_time_ms=300000,
             consistency=mqbconf.Consistency(strong=mqbconf.QueueConsistencyStrong()),
@@ -340,6 +338,7 @@ class Proto:
             max_consumers=0,
             max_queues=0,
             max_idle_time=0,
+            mode=None,  # overwritten
         )
     )
 

src/python/blazingmq/dev/configurator/configurator.py

@@ -94,33 +94,7 @@ def virtual_cluster_definition(self):
         return copy.deepcopy(self.proto.virtual_cluster)
 
     def domain_definition(self):
-        domain = copy.deepcopy(self.proto.domain)
-        domain.mode.broadcast = None
-        domain.mode.fanout = None
-        domain.mode.priority = None
-
-        return domain
-
-    def broadcast_domain(self):
-        domain = copy.deepcopy(self.proto.domain)
-        domain.mode.fanout = None
-        domain.mode.priority = None
-
-        return domain
-
-    def fanout_domain(self):
-        domain = copy.deepcopy(self.proto.domain)
-        domain.mode.broadcast = None
-        domain.mode.priority = None
-
-        return domain
-
-    def priority_domain(self):
-        domain = copy.deepcopy(self.proto.domain)
-        domain.mode.broadcast = None
-        domain.mode.fanout = None
-
-        return domain
+        return copy.deepcopy(self.proto.domain)
 
     def broker(
         self,