php-enqueue · makasim · Oct 1, 2018 · Sep 28, 2018 · Sep 28, 2018 · Sep 28, 2018
diff --git a/pkg/enqueue-bundle/DependencyInjection/Configuration.php b/pkg/enqueue-bundle/DependencyInjection/Configuration.php
@@ -2,7 +2,6 @@
 
 namespace Enqueue\Bundle\DependencyInjection;
 
-use Enqueue\Client\Config;
 use Enqueue\Client\RouterProcessor;
 use Enqueue\Symfony\DependencyInjection\TransportFactory;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -35,10 +34,10 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->booleanNode('traceable_producer')->defaultValue($this->debug)->end()
                 ->scalarNode('prefix')->defaultValue('enqueue')->end()
                 ->scalarNode('app_name')->defaultValue('app')->end()
-                ->scalarNode('router_topic')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
-                ->scalarNode('router_queue')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
+                ->scalarNode('router_topic')->defaultValue('default')->cannotBeEmpty()->end()
+                ->scalarNode('router_queue')->defaultValue('default')->cannotBeEmpty()->end()
                 ->scalarNode('router_processor')->defaultValue(RouterProcessor::class)->end()
-                ->scalarNode('default_processor_queue')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
+                ->scalarNode('default_processor_queue')->defaultValue('default')->cannotBeEmpty()->end()
                 ->integerNode('redelivered_delay_time')->min(0)->defaultValue(0)->end()
             ->end()->end()
             ->arrayNode('consumption')->addDefaultsIfNotSet()->children()

diff --git a/pkg/enqueue-bundle/Tests/Functional/Client/ProducerTest.php b/pkg/enqueue-bundle/Tests/Functional/Client/ProducerTest.php
@@ -72,8 +72,8 @@ public function testShouldSendMessageInstanceAsCommandWithoutNeedForReply()
         $this->assertCount(1, $traces);
         $this->assertEquals('theMessage', $traces[0]['body']);
         $this->assertEquals([
-            'enqueue.processor_name' => 'test_command_subscriber_processor',
-            'enqueue.command_name' => 'theCommand',
+            'enqueue.processor' => 'test_command_subscriber_processor',
+            'enqueue.command' => 'theCommand',
         ], $traces[0]['properties']);
     }
 
@@ -93,8 +93,8 @@ public function testShouldSendExclusiveCommandWithNeedForReply()
         $this->assertCount(1, $traces);
         $this->assertEquals('theMessage', $traces[0]['body']);
         $this->assertEquals([
-            'enqueue.processor_name' => 'theExclusiveCommandName',
-            'enqueue.command_name' => 'theExclusiveCommandName',
+            'enqueue.processor' => 'theExclusiveCommandName',
+            'enqueue.command' => 'theExclusiveCommandName',
         ], $traces[0]['properties']);
     }
 
@@ -114,8 +114,8 @@ public function testShouldSendMessageInstanceCommandWithNeedForReply()
         $this->assertCount(1, $traces);
         $this->assertEquals('theMessage', $traces[0]['body']);
         $this->assertEquals([
-            'enqueue.processor_name' => 'test_command_subscriber_processor',
-            'enqueue.command_name' => 'theCommand',
+            'enqueue.processor' => 'test_command_subscriber_processor',
+            'enqueue.command' => 'theCommand',
         ], $traces[0]['properties']);
     }
 

diff --git a/pkg/enqueue/Client/Config.php b/pkg/enqueue/Client/Config.php
@@ -4,21 +4,13 @@
 
 class Config
 {
-    const PARAMETER_TOPIC_NAME = 'enqueue.topic_name';
-    const PARAMETER_COMMAND_NAME = 'enqueue.command_name';
-    const PARAMETER_PROCESSOR_NAME = 'enqueue.processor_name';
-
-    /**
-     * @deprecated
-     */
-    const PARAMETER_PROCESSOR_QUEUE_NAME = 'enqueue.processor_queue_name';
-
-    const DEFAULT_PROCESSOR_QUEUE_NAME = 'default';
-
-    /**
-     * @deprecated
-     */
-    const COMMAND_TOPIC = '__command__';
+    const TOPIC = 'enqueue.topic';
+    const COMMAND = 'enqueue.command';
+    const PROCESSOR = 'enqueue.processor';
+    const EXPIRE = 'enqueue.expire';
+    const PRIORITY = 'enqueue.priority';
+    const DELAY = 'enqueue.delay';
+    const CONTENT_TYPE = 'enqueue.content_type';
 
     /**
      * @var string
@@ -118,22 +110,6 @@ public function getRouterProcessorName(): string
         return $this->routerProcessorName;
     }
 
-    /**
-     * @deprecated
-     */
-    public function createTransportRouterTopicName(string $name): string
-    {
-        return strtolower(implode('.', array_filter([trim($this->prefix), trim($name)])));
-    }
-
-    /**
-     * @deprecated
-     */
-    public function createTransportQueueName(string $name): string
-    {
-        return strtolower(implode('.', array_filter([trim($this->prefix), trim($this->appName), trim($name)])));
-    }
-
     /**
      * @deprecated
      *

diff --git a/pkg/enqueue/Client/ConsumptionExtension/ExclusiveCommandExtension.php b/pkg/enqueue/Client/ConsumptionExtension/ExclusiveCommandExtension.php
@@ -33,13 +33,13 @@ public function onPreReceived(Context $context)
         $message = $context->getInteropMessage();
         $queue = $context->getInteropQueue();
 
-        if ($message->getProperty(Config::PARAMETER_TOPIC_NAME)) {
+        if ($message->getProperty(Config::TOPIC)) {
             return;
         }
-        if ($message->getProperty(Config::PARAMETER_COMMAND_NAME)) {
+        if ($message->getProperty(Config::COMMAND)) {
             return;
         }
-        if ($message->getProperty(Config::PARAMETER_PROCESSOR_NAME)) {
+        if ($message->getProperty(Config::PROCESSOR)) {
             return;
         }
 
@@ -51,8 +51,8 @@ public function onPreReceived(Context $context)
             $context->getLogger()->debug('[ExclusiveCommandExtension] This is a exclusive command queue and client\'s properties are not set. Setting them');
 
             $route = $this->queueToRouteMap[$queue->getQueueName()];
-            $message->setProperty(Config::PARAMETER_PROCESSOR_NAME, $route->getProcessor());
-            $message->setProperty(Config::PARAMETER_COMMAND_NAME, $route->getSource());
+            $message->setProperty(Config::PROCESSOR, $route->getProcessor());
+            $message->setProperty(Config::COMMAND, $route->getSource());
         }
     }
 

diff --git a/pkg/enqueue/Client/ConsumptionExtension/SetRouterPropertiesExtension.php b/pkg/enqueue/Client/ConsumptionExtension/SetRouterPropertiesExtension.php
@@ -28,7 +28,7 @@ public function __construct(DriverInterface $driver)
     public function onPreReceived(Context $context)
     {
         $message = $context->getInteropMessage();
-        if ($message->getProperty(Config::PARAMETER_PROCESSOR_NAME)) {
+        if ($message->getProperty(Config::PROCESSOR)) {
             return;
         }
 
@@ -39,7 +39,7 @@ public function onPreReceived(Context $context)
         }
 
         // RouterProcessor is our default message processor when that header is not set
-        $message->setProperty(Config::PARAMETER_PROCESSOR_NAME, $config->getRouterProcessorName());
+        $message->setProperty(Config::PROCESSOR, $config->getRouterProcessorName());
 
         $context->getLogger()->debug(
             '[SetRouterPropertiesExtension] '.

diff --git a/pkg/enqueue/Client/DelegateProcessor.php b/pkg/enqueue/Client/DelegateProcessor.php
@@ -26,11 +26,11 @@ public function __construct(ProcessorRegistryInterface $registry)
      */
     public function process(InteropMessage $message, Context $context)
     {
-        $processorName = $message->getProperty(Config::PARAMETER_PROCESSOR_NAME);
+        $processorName = $message->getProperty(Config::PROCESSOR);
         if (false == $processorName) {
             throw new \LogicException(sprintf(
                 'Got message without required parameter: "%s"',
-                Config::PARAMETER_PROCESSOR_NAME
+                Config::PROCESSOR
             ));
         }
 

diff --git a/pkg/enqueue/Client/Driver/GenericDriver.php b/pkg/enqueue/Client/Driver/GenericDriver.php
@@ -47,10 +47,10 @@ public function __construct(
 
     public function sendToRouter(Message $message): void
     {
-        if ($message->getProperty(Config::PARAMETER_COMMAND_NAME)) {
+        if ($message->getProperty(Config::COMMAND)) {
             throw new \LogicException('Command must not be send to router but go directly to its processor.');
         }
-        if (false == $message->getProperty(Config::PARAMETER_TOPIC_NAME)) {
+        if (false == $message->getProperty(Config::TOPIC)) {
             throw new \LogicException('Topic name parameter is required but is not set');
         }
 
@@ -63,21 +63,21 @@ public function sendToRouter(Message $message): void
 
     public function sendToProcessor(Message $message): void
     {
-        $topic = $message->getProperty(Config::PARAMETER_TOPIC_NAME);
-        $command = $message->getProperty(Config::PARAMETER_COMMAND_NAME);
+        $topic = $message->getProperty(Config::TOPIC);
+        $command = $message->getProperty(Config::COMMAND);
 
         /** @var InteropQueue $queue */
         $queue = null;
-        if ($topic && $processor = $message->getProperty(Config::PARAMETER_PROCESSOR_NAME)) {
+        if ($topic && $processor = $message->getProperty(Config::PROCESSOR)) {
             $route = $this->routeCollection->topicAndProcessor($topic, $processor);
             if (false == $route) {
                 throw new \LogicException(sprintf('There is no route for topic "%s" and processor "%s"', $topic, $processor));
             }
 
-            $message->setProperty(Config::PARAMETER_PROCESSOR_NAME, $route->getProcessor());
+            $message->setProperty(Config::PROCESSOR, $route->getProcessor());
             $queue = $this->createRouteQueue($route);
-        } elseif ($topic && false == $message->getProperty(Config::PARAMETER_PROCESSOR_NAME)) {
-            $message->setProperty(Config::PARAMETER_PROCESSOR_NAME, $this->config->getRouterProcessorName());
+        } elseif ($topic && false == $message->getProperty(Config::PROCESSOR)) {
+            $message->setProperty(Config::PROCESSOR, $this->config->getRouterProcessorName());
 
             $queue = $this->createQueue($this->config->getRouterQueueName());
         } elseif ($command) {
@@ -86,7 +86,7 @@ public function sendToProcessor(Message $message): void
                 throw new \LogicException(sprintf('There is no route for command "%s".', $command));
             }
 
-            $message->setProperty(Config::PARAMETER_PROCESSOR_NAME, $route->getProcessor());
+            $message->setProperty(Config::PROCESSOR, $route->getProcessor());
             $queue = $this->createRouteQueue($route);
         } else {
             throw new \LogicException('Either topic or command parameter must be set.');
@@ -96,15 +96,15 @@ public function sendToProcessor(Message $message): void
 
         $producer = $this->context->createProducer();
 
-        if (null !== $delay = $transportMessage->getProperty('X-Enqueue-Delay')) {
+        if (null !== $delay = $transportMessage->getProperty(Config::DELAY)) {
             $producer->setDeliveryDelay($delay * 1000);
         }
 
-        if (null !== $expire = $transportMessage->getProperty('X-Enqueue-Expire')) {
+        if (null !== $expire = $transportMessage->getProperty(Config::EXPIRE)) {
             $producer->setTimeToLive($expire * 1000);
         }
 
-        if (null !== $priority = $transportMessage->getProperty('X-Enqueue-Priority')) {
+        if (null !== $priority = $transportMessage->getProperty(Config::PRIORITY)) {
             $priorityMap = $this->getPriorityMap();
 
             $producer->setPriority($priorityMap[$priority]);
@@ -149,19 +149,19 @@ public function createTransportMessage(Message $clientMessage): InteropMessage
         $transportMessage->setCorrelationId($clientMessage->getCorrelationId());
 
         if ($contentType = $clientMessage->getContentType()) {
-            $transportMessage->setProperty('X-Enqueue-Content-Type', $contentType);
+            $transportMessage->setProperty(Config::CONTENT_TYPE, $contentType);
         }
 
         if ($priority = $clientMessage->getPriority()) {
-            $transportMessage->setProperty('X-Enqueue-Priority', $priority);
+            $transportMessage->setProperty(Config::PRIORITY, $priority);
         }
 
         if ($expire = $clientMessage->getExpire()) {
-            $transportMessage->setProperty('X-Enqueue-Expire', $expire);
+            $transportMessage->setProperty(Config::EXPIRE, $expire);
         }
 
         if ($delay = $clientMessage->getDelay()) {
-            $transportMessage->setProperty('X-Enqueue-Delay', $delay);
+            $transportMessage->setProperty(Config::DELAY, $delay);
         }
 
         return $transportMessage;
@@ -179,19 +179,19 @@ public function createClientMessage(InteropMessage $transportMessage): Message
         $clientMessage->setReplyTo($transportMessage->getReplyTo());
         $clientMessage->setCorrelationId($transportMessage->getCorrelationId());
 
-        if ($contentType = $transportMessage->getProperty('X-Enqueue-Content-Type')) {
+        if ($contentType = $transportMessage->getProperty(Config::CONTENT_TYPE)) {
             $clientMessage->setContentType($contentType);
         }
 
-        if ($priority = $transportMessage->getProperty('X-Enqueue-Priority')) {
+        if ($priority = $transportMessage->getProperty(Config::PRIORITY)) {
             $clientMessage->setPriority($priority);
         }
 
-        if ($delay = $transportMessage->getProperty('X-Enqueue-Delay')) {
+        if ($delay = $transportMessage->getProperty(Config::DELAY)) {
             $clientMessage->setDelay((int) $delay);
         }
 
-        if ($expire = $transportMessage->getProperty('X-Enqueue-Expire')) {
+        if ($expire = $transportMessage->getProperty(Config::EXPIRE)) {
             $clientMessage->setExpire((int) $expire);
         }
 

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->getConfig()->createTransportRouterTopicName($this->getConfig()->getRouterTopicName());
+        $routerExchange = $this->createTransportRouterTopicName($this->getConfig()->getRouterTopicName(), true);
         $log('Declare router exchange: %s', $routerExchange);
         $this->management->declareExchange($routerExchange, [
             'type' => 'fanout',
             'durable' => true,
             'auto_delete' => false,
         ]);
 
-        $routerQueue = $this->getConfig()->createTransportQueueName($this->getConfig()->getRouterQueueName());
+        $routerQueue = $this->createTransportQueueName($this->getConfig()->getRouterQueueName(), true);
         $log('Declare router queue: %s', $routerQueue);
         $this->management->declareQueue($routerQueue, [
             'auto_delete' => false,
@@ -169,7 +169,7 @@ protected function doSendToRouter(InteropProducer $producer, Destination $topic,
      */
     protected function doSendToProcessor(InteropProducer $producer, InteropQueue $destination, InteropMessage $transportMessage): void
     {
-        if ($delay = $transportMessage->getProperty('X-Enqueue-Delay')) {
+        if ($delay = $transportMessage->getProperty(Config::DELAY)) {
             $producer->setDeliveryDelay(null);
             $destination = $this->createDelayedTopic($destination);
         }

diff --git a/pkg/enqueue/Client/DriverPreSend.php b/pkg/enqueue/Client/DriverPreSend.php
@@ -34,21 +34,21 @@ public function getDriver(): DriverInterface
 
     public function isEvent(): bool
     {
-        return (bool) $this->message->getProperty(Config::PARAMETER_TOPIC_NAME);
+        return (bool) $this->message->getProperty(Config::TOPIC);
     }
 
     public function isCommand(): bool
     {
-        return (bool) $this->message->getProperty(Config::PARAMETER_COMMAND_NAME);
+        return (bool) $this->message->getProperty(Config::COMMAND);
     }
 
     public function getCommand(): string
     {
-        return $this->message->getProperty(Config::PARAMETER_COMMAND_NAME);
+        return $this->message->getProperty(Config::COMMAND);
     }
 
     public function getTopic(): string
     {
-        return $this->message->getProperty(Config::PARAMETER_TOPIC_NAME);
+        return $this->message->getProperty(Config::TOPIC);
     }
 }
diff --git a/pkg/enqueue/Client/PostSend.php b/pkg/enqueue/Client/PostSend.php
@@ -34,21 +34,21 @@ public function getDriver(): DriverInterface
 
     public function isEvent(): bool
     {
-        return (bool) $this->message->getProperty(Config::PARAMETER_TOPIC_NAME);
+        return (bool) $this->message->getProperty(Config::TOPIC);
     }
 
     public function isCommand(): bool
     {
-        return (bool) $this->message->getProperty(Config::PARAMETER_COMMAND_NAME);
+        return (bool) $this->message->getProperty(Config::COMMAND);
     }
 
     public function getCommand(): string
     {
-        return $this->message->getProperty(Config::PARAMETER_COMMAND_NAME);
+        return $this->message->getProperty(Config::COMMAND);
     }
 
     public function getTopic(): string
     {
-        return $this->message->getProperty(Config::PARAMETER_TOPIC_NAME);
+        return $this->message->getProperty(Config::TOPIC);
     }
 }
diff --git a/pkg/enqueue/Client/Producer.php b/pkg/enqueue/Client/Producer.php
@@ -48,7 +48,7 @@ public function sendEvent(string $topic, $message): void
         $this->extension->onPreSendEvent($preSend);
 
         $message = $preSend->getMessage();
-        $message->setProperty(Config::PARAMETER_TOPIC_NAME, $preSend->getTopic());
+        $message->setProperty(Config::TOPIC, $preSend->getTopic());
 
         $this->doSend($message);
     }
@@ -79,7 +79,7 @@ public function sendCommand(string $command, $message, bool $needReply = false):
             }
         }
 
-        $message->setProperty(Config::PARAMETER_COMMAND_NAME, $command);
+        $message->setProperty(Config::COMMAND, $command);
         $message->setScope(Message::SCOPE_APP);
 
         $this->doSend($message);
@@ -103,8 +103,8 @@ private function doSend(Message $message): void
             ));
         }
 
-        if ($message->getProperty(Config::PARAMETER_PROCESSOR_NAME)) {
-            throw new \LogicException(sprintf('The %s property must not be set.', Config::PARAMETER_PROCESSOR_NAME));
+        if ($message->getProperty(Config::PROCESSOR)) {
+            throw new \LogicException(sprintf('The %s property must not be set.', Config::PROCESSOR));
         }
 
         if (!$message->getMessageId()) {