[client] Reorganize configuration. Remove unused parameters.

Author: makasim

pkg/enqueue/Client/Driver/GenericDriver.php

@@ -96,7 +96,7 @@ 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_PARAMETER)) {
             $producer->setDeliveryDelay($delay * 1000);
         }
 
@@ -161,7 +161,7 @@ public function createTransportMessage(Message $clientMessage): InteropMessage
         }
 
         if ($delay = $clientMessage->getDelay()) {
-            $transportMessage->setProperty('X-Enqueue-Delay', $delay);
+            $transportMessage->setProperty(Config::DELAY_PARAMETER, $delay);
         }
 
         return $transportMessage;
@@ -187,7 +187,7 @@ public function createClientMessage(InteropMessage $transportMessage): Message
             $clientMessage->setPriority($priority);
         }
 
-        if ($delay = $transportMessage->getProperty('X-Enqueue-Delay')) {
+        if ($delay = $transportMessage->getProperty(Config::DELAY_PARAMETER)) {
             $clientMessage->setDelay((int) $delay);
         }
 

pkg/enqueue/Client/Driver/RabbitMqStompDriver.php

@@ -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_PARAMETER)) {
             $producer->setDeliveryDelay(null);
             $destination = $this->createDelayedTopic($destination);
         }

pkg/enqueue/Tests/Client/Driver/AmqpDriverTest.php

@@ -352,7 +352,7 @@ protected function assertTransportMessage(InteropMessage $transportMessage): voi
             'X-Enqueue-Content-Type' => 'ContentType',
             'X-Enqueue-Priority' => MessagePriority::HIGH,
             'X-Enqueue-Expire' => 123,
-            'X-Enqueue-Delay' => 345,
+            'enqueue.delay' => 345,
         ], $transportMessage->getProperties());
         $this->assertSame('theMessageId', $transportMessage->getMessageId());
         $this->assertSame(1000, $transportMessage->getTimestamp());

pkg/enqueue/Tests/Client/Driver/GenericDriverTest.php

@@ -71,7 +71,7 @@ protected function assertTransportMessage(InteropMessage $transportMessage): voi
             'X-Enqueue-Content-Type' => 'ContentType',
             'X-Enqueue-Priority' => MessagePriority::HIGH,
             'X-Enqueue-Expire' => 123,
-            'X-Enqueue-Delay' => 345,
+            'enqueue.delay' => 345,
         ], $transportMessage->getProperties());
         $this->assertSame('theMessageId', $transportMessage->getMessageId());
         $this->assertSame(1000, $transportMessage->getTimestamp());

pkg/enqueue/Tests/Client/Driver/GenericDriverTestsTrait.php

@@ -200,7 +200,7 @@ public function testShouldCreateClientMessageFromTransportOne()
         $transportMessage->setProperty('X-Enqueue-Content-Type', 'theContentType');
         $transportMessage->setProperty('X-Enqueue-Expire', '22');
         $transportMessage->setProperty('X-Enqueue-Priority', MessagePriority::HIGH);
-        $transportMessage->setProperty('X-Enqueue-Delay', '44');
+        $transportMessage->setProperty('enqueue.delay', '44');
         $transportMessage->setMessageId('theMessageId');
         $transportMessage->setTimestamp(1000);
         $transportMessage->setReplyTo('theReplyTo');
@@ -1124,7 +1124,7 @@ protected function assertTransportMessage(InteropMessage $transportMessage): voi
             'X-Enqueue-Content-Type' => 'ContentType',
             'X-Enqueue-Priority' => MessagePriority::HIGH,
             'X-Enqueue-Expire' => 123,
-            'X-Enqueue-Delay' => 345,
+            'enqueue.delay' => 345,
         ], $transportMessage->getProperties());
         $this->assertSame('theMessageId', $transportMessage->getMessageId());
         $this->assertSame(1000, $transportMessage->getTimestamp());
@@ -1143,7 +1143,7 @@ protected function assertClientMessage(Message $clientMessage): void
             'X-Enqueue-Content-Type' => 'theContentType',
             'X-Enqueue-Expire' => '22',
             'X-Enqueue-Priority' => MessagePriority::HIGH,
-            'X-Enqueue-Delay' => '44',
+            'enqueue.delay' => '44',
         ], $clientMessage->getProperties());
         $this->assertSame('theMessageId', $clientMessage->getMessageId());
         $this->assertSame(22, $clientMessage->getExpire());

pkg/enqueue/Tests/Client/Driver/RabbitMqDriverTest.php

@@ -130,7 +130,7 @@ protected function assertTransportMessage(InteropMessage $transportMessage): voi
             'X-Enqueue-Content-Type' => 'ContentType',
             'X-Enqueue-Priority' => MessagePriority::HIGH,
             'X-Enqueue-Expire' => 123,
-            'X-Enqueue-Delay' => 345,
+            'enqueue.delay' => 345,
         ], $transportMessage->getProperties());
         $this->assertSame('theMessageId', $transportMessage->getMessageId());
         $this->assertSame(1000, $transportMessage->getTimestamp());

pkg/enqueue/Tests/Client/Driver/RabbitMqStompDriverTest.php

@@ -543,7 +543,7 @@ protected function assertTransportMessage(InteropMessage $transportMessage): voi
             'X-Enqueue-Content-Type' => 'ContentType',
             'X-Enqueue-Priority' => MessagePriority::HIGH,
             'X-Enqueue-Expire' => 123,
-            'X-Enqueue-Delay' => 345,
+            'enqueue.delay' => 345,
         ], $transportMessage->getProperties());
         $this->assertSame('theMessageId', $transportMessage->getMessageId());
         $this->assertSame(1000, $transportMessage->getTimestamp());

pkg/enqueue/Tests/Client/Driver/StompDriverTest.php

@@ -169,7 +169,7 @@ protected function assertTransportMessage(InteropMessage $transportMessage): voi
             'X-Enqueue-Content-Type' => 'ContentType',
             'X-Enqueue-Priority' => MessagePriority::HIGH,
             'X-Enqueue-Expire' => 123,
-            'X-Enqueue-Delay' => 345,
+            'enqueue.delay' => 345,
         ], $transportMessage->getProperties());
         $this->assertSame('theMessageId', $transportMessage->getMessageId());
         $this->assertSame(1000, $transportMessage->getTimestamp());