AC-14558::Migration form RabbitMQ to Apache ActiveMQ

Author: Dnyaneshwar S Jambhulkar

lib/internal/Magento/Framework/Amqp/Config.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Framework\Amqp;
 

lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php

@@ -58,7 +58,6 @@ public function __construct(
      * @param \Closure $callback
      * @param mixed $maxIdleTime
      * @param mixed $sleep
-     * @param string $connectionName
      * @return void
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)

lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright 2015 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
@@ -19,9 +19,8 @@ interface CallbackInvokerInterface
      * @param QueueInterface $queue
      * @param int $maxNumberOfMessages
      * @param \Closure $callback
-     * @param mixed $maxIdleTime
-     * @param mixed $sleep
-     * @param string $connectionName
+     * @param int|null $maxIdleTime
+     * @param int|null $sleep
      * @return void
      */
     public function invoke(

lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerTest.php

@@ -14,7 +14,6 @@
 use Magento\Framework\MessageQueue\Consumer;
 use Magento\Framework\MessageQueue\Consumer\ConfigInterface;
 use Magento\Framework\MessageQueue\ConsumerConfigurationInterface;
-use Magento\Framework\MessageQueue\DefaultValueProvider;
 use Magento\Framework\MessageQueue\EnvelopeInterface;
 use Magento\Framework\MessageQueue\MessageController;
 use Magento\Framework\MessageQueue\MessageEncoder;
@@ -100,11 +99,6 @@ class ConsumerTest extends TestCase
      */
     private $deploymentConfig;
 
-    /**
-     * @var DefaultValueProvider|MockObject
-     */
-    private $defaultValueProvider;
-
     /**
      * Set up.
      *
@@ -129,7 +123,6 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $this->deploymentConfig = $this->createMock(DeploymentConfig::class);
-        $this->defaultValueProvider = $this->createMock(DefaultValueProvider::class);
 
         $objectManager = new ObjectManager($this);
         $this->poisonPillCompare = $this->getMockBuilder(PoisonPillCompareInterface::class)
@@ -142,18 +135,17 @@ protected function setUp(): void
         $this->callbackInvoker = new CallbackInvoker(
             $this->poisonPillRead,
             $this->poisonPillCompare,
-            $this->deploymentConfig,
-            $this->defaultValueProvider
+            $this->deploymentConfig
         );
         $this->consumer = $objectManager->getObject(
             Consumer::class,
             [
-                'configuration' => $this->configuration,
-                'messageEncoder' => $this->messageEncoder,
-                'queueRepository' => $this->queueRepository,
                 'invoker' => $this->callbackInvoker,
+                'messageEncoder' => $this->messageEncoder,
                 'resource' => $this->resource,
-                'logger' => $this->logger
+                'configuration' => $this->configuration,
+                'logger' => $this->logger,
+                'queueRepository' => $this->queueRepository
             ]
         );
 
@@ -196,7 +188,6 @@ public function testProcessWithNotFoundException()
         $exceptionPhrase = new Phrase('Exception successfully thrown');
         $this->poisonPillRead->expects($this->atLeastOnce())->method('getLatestVersion')->willReturn('version-1');
         $this->poisonPillCompare->expects($this->atLeastOnce())->method('isLatestVersion')->willReturn(true);
-        $this->defaultValueProvider->expects($this->once())->method('getConnection')->willReturn('db');
         $this->deploymentConfig->expects($this->any())->method('get')
             ->with('queue/consumers_wait_for_messages', 1)->willReturn(1);
         $queue = $this->getMockBuilder(QueueInterface::class)
@@ -233,7 +224,6 @@ public function testProcessWithGetMaxIdleTimeAndGetSleepConsumerConfigurations()
         $numberOfMessages = 1;
         $this->poisonPillRead->expects($this->atLeastOnce())->method('getLatestVersion')->willReturn('version-1');
         $this->poisonPillCompare->expects($this->any())->method('isLatestVersion')->willReturn(true);
-        $this->defaultValueProvider->expects($this->once())->method('getConnection')->willReturn('db');
         $this->deploymentConfig->expects($this->any())->method('get')
             ->with('queue/consumers_wait_for_messages', 1)->willReturn(1);
         $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)