php-enqueue · makasim · Oct 1, 2018 · Oct 1, 2018
diff --git a/pkg/enqueue/Client/Config.php b/pkg/enqueue/Client/Config.php
@@ -20,59 +20,66 @@ class Config
     /**
      * @var string
      */
-    private $appName;
+    private $separator;
 
     /**
      * @var string
      */
-    private $routerTopicName;
+    private $app;
 
     /**
      * @var string
      */
-    private $routerQueueName;
+    private $routerTopic;
 
     /**
      * @var string
      */
-    private $defaultProcessorQueueName;
+    private $routerQueue;
 
     /**
      * @var string
      */
-    private $routerProcessorName;
+    private $defaultQueue;
+
+    /**
+     * @var string
+     */
+    private $routerProcessor;
 
     /**
      * @var array
      */
     private $transportConfig;
 
-    public function __construct(string $prefix, string $appName, string $routerTopicName, string $routerQueueName, string $defaultProcessorQueueName, string $routerProcessorName, array $transportConfig = [])
+    public function __construct(string $prefix, string $app, string $routerTopic, string $routerQueue, string $defaultQueue, string $routerProcessor, array $transportConfig = [])
     {
         $this->prefix = trim($prefix);
-        $this->appName = trim($appName);
+        $this->app = trim($app);
 
-        $this->routerTopicName = trim($routerTopicName);
-        if (empty($this->routerTopicName)) {
+        $this->routerTopic = trim($routerTopic);
+        if (empty($this->routerTopic)) {
             throw new \InvalidArgumentException('Router topic is empty.');
         }
 
-        $this->routerQueueName = trim($routerQueueName);
-        if (empty($this->routerQueueName)) {
+        $this->routerQueue = trim($routerQueue);
+        if (empty($this->routerQueue)) {
             throw new \InvalidArgumentException('Router queue is empty.');
         }
 
-        $this->defaultProcessorQueueName = trim($defaultProcessorQueueName);
-        if (empty($this->defaultProcessorQueueName)) {
+        $this->defaultQueue = trim($defaultQueue);
+        if (empty($this->defaultQueue)) {
             throw new \InvalidArgumentException('Default processor queue name is empty.');
         }
 
-        $this->routerProcessorName = trim($routerProcessorName);
-        if (empty($this->routerProcessorName)) {
+        $this->routerProcessor = trim($routerProcessor);
+        if (empty($this->routerProcessor)) {
             throw new \InvalidArgumentException('Router processor name is empty.');
         }
 
         $this->transportConfig = $transportConfig;
+
+        $this->separator = '.';
     }
 
     public function getPrefix(): string
@@ -82,32 +89,32 @@ public function getPrefix(): string
 
     public function getSeparator(): string
     {
-        return '.';
+        return $this->separator;
     }
 
-    public function getAppName(): string
+    public function getApp(): string
     {
-        return $this->appName;
+        return $this->app;
     }
 
-    public function getRouterTopicName(): string
+    public function getRouterTopic(): string
     {
-        return $this->routerTopicName;
+        return $this->routerTopic;
     }
 
-    public function getRouterQueueName(): string
+    public function getRouterQueue(): string
     {
-        return $this->routerQueueName;
+        return $this->routerQueue;
     }
 
-    public function getDefaultProcessorQueueName(): string
+    public function getDefaultQueue(): string
     {
-        return $this->defaultProcessorQueueName;
+        return $this->defaultQueue;
     }
 
-    public function getRouterProcessorName(): string
+    public function getRouterProcessor(): string
     {
-        return $this->routerProcessorName;
+        return $this->routerProcessor;
     }
 
     /**
@@ -122,20 +129,20 @@ public function getTransportOption(string $name, $default = null)
 
     public static function create(
         string $prefix = null,
-        string $appName = null,
-        string $routerTopicName = null,
-        string $routerQueueName = null,
-        string $defaultProcessorQueueName = null,
-        string $routerProcessorName = null,
+        string $app = null,
+        string $routerTopic = null,
+        string $routerQueue = null,
+        string $defaultQueue = null,
+        string $routerProcessor = null,
         array $transportConfig = []
     ): self {
         return new static(
             $prefix ?: '',
-            $appName ?: '',
-            $routerTopicName ?: 'router',
-            $routerQueueName ?: 'default',
-            $defaultProcessorQueueName ?: 'default',
-            $routerProcessorName ?: 'router',
+            $app ?: '',
+            $routerTopic ?: 'router',
+            $routerQueue ?: 'default',
+            $defaultQueue ?: 'default',
+            $routerProcessor ?: 'router',
             $transportConfig
         );
     }

diff --git a/pkg/enqueue/Client/ConsumptionExtension/SetRouterPropertiesExtension.php b/pkg/enqueue/Client/ConsumptionExtension/SetRouterPropertiesExtension.php
@@ -33,17 +33,17 @@ public function onPreReceived(Context $context)
         }
 
         $config = $this->driver->getConfig();
-        $queue = $this->driver->createQueue($config->getRouterQueueName());
+        $queue = $this->driver->createQueue($config->getRouterQueue());
         if ($context->getInteropQueue()->getQueueName() != $queue->getQueueName()) {
             return;
         }
 
         // RouterProcessor is our default message processor when that header is not set
-        $message->setProperty(Config::PROCESSOR, $config->getRouterProcessorName());
+        $message->setProperty(Config::PROCESSOR, $config->getRouterProcessor());
 
         $context->getLogger()->debug(
             '[SetRouterPropertiesExtension] '.
-            sprintf('Set router processor "%s"', $config->getRouterProcessorName())
+            sprintf('Set router processor "%s"', $config->getRouterProcessor())
         );
     }
 }
diff --git a/pkg/enqueue/Client/Driver/AmqpDriver.php b/pkg/enqueue/Client/Driver/AmqpDriver.php
@@ -70,7 +70,7 @@ public function setupBroker(LoggerInterface $logger = null): void
         $log('Declare router exchange: %s', $routerTopic->getTopicName());
         $this->getContext()->declareTopic($routerTopic);
 
-        $routerQueue = $this->createQueue($this->getConfig()->getRouterQueueName());
+        $routerQueue = $this->createQueue($this->getConfig()->getRouterQueue());
         $log('Declare router queue: %s', $routerQueue->getQueueName());
         $this->getContext()->declareQueue($routerQueue);
 
@@ -99,7 +99,7 @@ public function setupBroker(LoggerInterface $logger = null): void
     protected function createRouterTopic(): Destination
     {
         $topic = $this->doCreateTopic(
-            $this->createTransportRouterTopicName($this->getConfig()->getRouterTopicName(), true)
+            $this->createTransportRouterTopicName($this->getConfig()->getRouterTopic(), true)
         );
         $topic->setType(AmqpTopic::TYPE_FANOUT);
         $topic->addFlag(AmqpTopic::FLAG_DURABLE);

diff --git a/pkg/enqueue/Client/Driver/FsDriver.php b/pkg/enqueue/Client/Driver/FsDriver.php
@@ -26,7 +26,7 @@ public function setupBroker(LoggerInterface $logger = null): void
         };
 
         // setup router
-        $routerQueue = $this->createQueue($this->getConfig()->getRouterQueueName());
+        $routerQueue = $this->createQueue($this->getConfig()->getRouterQueue());
 
         $log('Declare router queue "%s" file: %s', $routerQueue->getQueueName(), $routerQueue->getFileInfo());
         $this->getContext()->declareDestination($routerQueue);

diff --git a/pkg/enqueue/Client/Driver/GenericDriver.php b/pkg/enqueue/Client/Driver/GenericDriver.php
@@ -77,9 +77,9 @@ public function sendToProcessor(Message $message): void
             $message->setProperty(Config::PROCESSOR, $route->getProcessor());
             $queue = $this->createRouteQueue($route);
         } elseif ($topic && false == $message->getProperty(Config::PROCESSOR)) {
-            $message->setProperty(Config::PROCESSOR, $this->config->getRouterProcessorName());
+            $message->setProperty(Config::PROCESSOR, $this->config->getRouterProcessor());
 
-            $queue = $this->createQueue($this->config->getRouterQueueName());
+            $queue = $this->createQueue($this->config->getRouterQueue());
         } elseif ($command) {
             $route = $this->routeCollection->command($command);
             if (false == $route) {
@@ -127,7 +127,7 @@ public function createQueue(string $clientQueueName, bool $prefix = true): Inter
     public function createRouteQueue(Route $route): InteropQueue
     {
         $transportName = $this->createTransportQueueName(
-            $route->getQueue() ?: $this->config->getDefaultProcessorQueueName(),
+            $route->getQueue() ?: $this->config->getDefaultQueue(),
             $route->isPrefixQueue()
         );
 
@@ -225,7 +225,7 @@ protected function doSendToProcessor(InteropProducer $producer, InteropQueue $qu
 
     protected function createRouterTopic(): Destination
     {
-        return $this->createQueue($this->getConfig()->getRouterQueueName());
+        return $this->createQueue($this->getConfig()->getRouterQueue());
     }
 
     protected function createTransportRouterTopicName(string $name, bool $prefix): string
@@ -238,7 +238,7 @@ protected function createTransportRouterTopicName(string $name, bool $prefix): s
     protected function createTransportQueueName(string $name, bool $prefix): string
     {
         $clientPrefix = $prefix ? $this->config->getPrefix() : '';
-        $clientAppName = $prefix ? $this->config->getAppName() : '';
+        $clientAppName = $prefix ? $this->config->getApp() : '';
 
         return strtolower(implode($this->config->getSeparator(), array_filter([$clientPrefix, $clientAppName, $name])));
     }

diff --git a/pkg/enqueue/Client/Driver/GpsDriver.php b/pkg/enqueue/Client/Driver/GpsDriver.php
@@ -29,7 +29,7 @@ public function setupBroker(LoggerInterface $logger = null): void
 
         // setup router
         $routerTopic = $this->createRouterTopic();
-        $routerQueue = $this->createQueue($this->getConfig()->getRouterQueueName());
+        $routerQueue = $this->createQueue($this->getConfig()->getRouterQueue());
 
         $log('Subscribe router topic to queue: %s -> %s', $routerTopic->getTopicName(), $routerQueue->getQueueName());
         $this->getContext()->subscribe($routerTopic, $routerQueue);
@@ -58,7 +58,7 @@ public function setupBroker(LoggerInterface $logger = null): void
     protected function createRouterTopic(): Destination
     {
         return $this->doCreateTopic(
-            $this->createTransportRouterTopicName($this->getConfig()->getRouterTopicName(), true)
+            $this->createTransportRouterTopicName($this->getConfig()->getRouterTopic(), true)
         );
     }
 }
diff --git a/pkg/enqueue/Client/Driver/RabbitMqStompDriver.php b/pkg/enqueue/Client/Driver/RabbitMqStompDriver.php
@@ -76,15 +76,15 @@ public function setupBroker(LoggerInterface $logger = null): void
         }
 
         // setup router
-        $routerExchange = $this->createTransportRouterTopicName($this->getConfig()->getRouterTopicName(), true);
+        $routerExchange = $this->createTransportRouterTopicName($this->getConfig()->getRouterTopic(), true);
         $log('Declare router exchange: %s', $routerExchange);
         $this->management->declareExchange($routerExchange, [
             'type' => 'fanout',
             'durable' => true,
             'auto_delete' => false,
         ]);
 
-        $routerQueue = $this->createTransportQueueName($this->getConfig()->getRouterQueueName(), true);
+        $routerQueue = $this->createTransportQueueName($this->getConfig()->getRouterQueue(), true);
         $log('Declare router queue: %s', $routerQueue);
         $this->management->declareQueue($routerQueue, [
             'auto_delete' => false,

diff --git a/pkg/enqueue/Client/Driver/RdKafkaDriver.php b/pkg/enqueue/Client/Driver/RdKafkaDriver.php
@@ -27,7 +27,7 @@ public function setupBroker(LoggerInterface $logger = null): void
         };
 
         // setup router
-        $routerQueue = $this->createQueue($this->getConfig()->getRouterQueueName());
+        $routerQueue = $this->createQueue($this->getConfig()->getRouterQueue());
         $log('Create router queue: %s', $routerQueue->getQueueName());
         $this->getContext()->createConsumer($routerQueue);
 
@@ -51,7 +51,7 @@ public function setupBroker(LoggerInterface $logger = null): void
     protected function createRouterTopic(): Destination
     {
         return $this->doCreateTopic(
-            $this->createTransportRouterTopicName($this->getConfig()->getRouterTopicName(), true)
+            $this->createTransportRouterTopicName($this->getConfig()->getRouterTopic(), true)
         );
     }
 }
diff --git a/pkg/enqueue/Client/Driver/SqsDriver.php b/pkg/enqueue/Client/Driver/SqsDriver.php
@@ -26,7 +26,7 @@ public function setupBroker(LoggerInterface $logger = null): void
         };
 
         // setup router
-        $routerQueue = $this->createQueue($this->getConfig()->getRouterQueueName());
+        $routerQueue = $this->createQueue($this->getConfig()->getRouterQueue());
         $log('Declare router queue: %s', $routerQueue->getQueueName());
         $this->getContext()->declareQueue($routerQueue);
 

diff --git a/pkg/enqueue/Client/Driver/StompDriver.php b/pkg/enqueue/Client/Driver/StompDriver.php
@@ -61,7 +61,7 @@ protected function createRouterTopic(): Destination
     {
         /** @var StompDestination $topic */
         $topic = $this->doCreateTopic(
-            $this->createTransportRouterTopicName($this->getConfig()->getRouterTopicName(), true)
+            $this->createTransportRouterTopicName($this->getConfig()->getRouterTopic(), true)
         );
         $topic->setDurable(true);
         $topic->setAutoDelete(false);

diff --git a/pkg/enqueue/Symfony/Client/ConsumeMessagesCommand.php b/pkg/enqueue/Symfony/Client/ConsumeMessagesCommand.php
@@ -74,8 +74,8 @@ protected function execute(InputInterface $input, OutputInterface $output): ?int
 
         $clientQueueNames = $input->getArgument('client-queue-names');
         if (empty($clientQueueNames)) {
-            $clientQueueNames[$this->driver->getConfig()->getDefaultProcessorQueueName()] = true;
-            $clientQueueNames[$this->driver->getConfig()->getRouterQueueName()] = true;
+            $clientQueueNames[$this->driver->getConfig()->getDefaultQueue()] = true;
+            $clientQueueNames[$this->driver->getConfig()->getRouterQueue()] = true;
 
             foreach ($this->driver->getRouteCollection()->all() as $route) {
                 if ($route->getQueue()) {

diff --git a/pkg/enqueue/Symfony/Client/RoutesCommand.php b/pkg/enqueue/Symfony/Client/RoutesCommand.php
@@ -119,7 +119,7 @@ private function formatProcessor(Route $route): string
 
     private function formatQueue(Route $route): string
     {
-        $queue = $route->getQueue() ?: $this->config->getDefaultProcessorQueueName();
+        $queue = $route->getQueue() ?: $this->config->getDefaultQueue();
 
         return $route->isPrefixQueue() ? $queue.' (prefixed)' : $queue.' (as is)';
     }