Merge remote-tracking branch 'origin/AC-14558-stomp-v2' into Platform_Health_ActiveMQ_Delivery

Author: glo71317

app/code/Magento/Amqp/Setup/ConfigOptionsList.php

@@ -5,11 +5,11 @@
  */
 namespace Magento\Amqp\Setup;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\Data\ConfigData;
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Setup\ConfigOptionsListInterface;
 use Magento\Framework\Setup\Option\TextConfigOption;
-use Magento\Framework\App\DeploymentConfig;
 
 /**
  * Deployment configuration options needed for Setup application

app/code/Magento/AsynchronousOperations/Model/MassConsumer.php

@@ -9,12 +9,12 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\MessageQueue\CallbackInvokerInterface;
+use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfig;
 use Magento\Framework\MessageQueue\ConsumerConfigurationInterface;
 use Magento\Framework\MessageQueue\ConsumerInterface;
 use Magento\Framework\MessageQueue\EnvelopeInterface;
 use Magento\Framework\MessageQueue\QueueInterface;
 use Magento\Framework\Registry;
-use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfig;
 
 /**
  * Class Consumer used to process OperationInterface messages.
@@ -85,16 +85,12 @@ public function process($maxNumberOfMessages = null)
         if (!isset($maxNumberOfMessages)) {
             $queue->subscribe($this->getTransactionCallback($queue));
         } else {
-            $connectionName = $this->consumerConfig
-                              ->getConsumer($this->configuration->getConsumerName())
-                              ->getConnection();
             $this->invoker->invoke(
                 $queue,
                 $maxNumberOfMessages,
                 $this->getTransactionCallback($queue),
                 $maxIdleTime,
-                $sleep,
-                $connectionName
+                $sleep
             );
         }
 

app/code/Magento/Stomp/Model/Bulk/Publisher.php

@@ -8,13 +8,13 @@
 namespace Magento\Stomp\Model\Bulk;
 
 use Magento\Framework\MessageQueue\Bulk\Queue\QueueRepository as BulkQueueRepository;
-use Magento\Framework\MessageQueue\QueueRepository;
 use Magento\Framework\MessageQueue\EnvelopeFactory;
-use Magento\Framework\MessageQueue\MessageIdGeneratorInterface;
-use Magento\Framework\MessageQueue\PublisherInterface;
 use Magento\Framework\MessageQueue\MessageEncoder;
+use Magento\Framework\MessageQueue\MessageIdGeneratorInterface;
 use Magento\Framework\MessageQueue\MessageValidator;
 use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+use Magento\Framework\MessageQueue\PublisherInterface;
+use Magento\Framework\MessageQueue\QueueRepository;
 
 /**
  * A MessageQueue Publisher to handle publishing messages in bulk.

app/code/Magento/Stomp/Model/MassPublisher.php

@@ -7,14 +7,14 @@
 declare(strict_types=1);
 namespace Magento\Stomp\Model;
 
-use Magento\Framework\MessageQueue\MessageValidator;
+use Magento\AsynchronousOperations\Model\ConfigInterface as AsyncConfig;
+use Magento\Framework\MessageQueue\Bulk\Queue\QueueRepository as BulkQueueRepository;
+use Magento\Framework\MessageQueue\EnvelopeFactory;
 use Magento\Framework\MessageQueue\MessageEncoder;
+use Magento\Framework\MessageQueue\MessageIdGeneratorInterface;
+use Magento\Framework\MessageQueue\MessageValidator;
 use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
-use Magento\Framework\MessageQueue\EnvelopeFactory;
-use Magento\AsynchronousOperations\Model\ConfigInterface as AsyncConfig;
 use Magento\Framework\MessageQueue\PublisherInterface;
-use Magento\Framework\MessageQueue\MessageIdGeneratorInterface;
-use Magento\Framework\MessageQueue\Bulk\Queue\QueueRepository as BulkQueueRepository;
 use Magento\Framework\MessageQueue\QueueRepository;
 
 /**

app/code/Magento/Stomp/Model/Rpc/Publisher.php

@@ -111,7 +111,7 @@ public function publish($topicName, $data)
         $publisher = $this->publisherConfig->getPublisher($topicName);
         $connectionName = $publisher->getConnection()->getName();
         $queue = $this->queueRepository->get($connectionName, $replyTo);
-        $responseMessage = $queue->push($envelope);
+        $responseMessage = $queue->callRpc($envelope);
         return $this->messageEncoder->decode($topicName, $responseMessage, false);
     }
 }

app/code/Magento/Stomp/Setup/ConfigOptionsList.php

@@ -7,11 +7,11 @@
 
 namespace Magento\Stomp\Setup;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\Data\ConfigData;
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Setup\ConfigOptionsListInterface;
 use Magento\Framework\Setup\Option\TextConfigOption;
-use Magento\Framework\App\DeploymentConfig;
 
 /**
  * Deployment configuration options needed for Setup application

app/code/Magento/Stomp/Setup/Recurring.php

@@ -7,10 +7,10 @@
 
 namespace Magento\Stomp\Setup;
 
-use Magento\Framework\Stomp\TopologyInstaller;
 use Magento\Framework\Setup\InstallSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Stomp\TopologyInstaller;
 
 /**
  * Class Recurring used for installing queues in ActiveMq

app/code/Magento/Stomp/Test/Unit/Setup/ConfigOptionsListTest.php

@@ -7,12 +7,12 @@
 
 namespace Magento\Stomp\Test\Unit\Setup;
 
-use Magento\Stomp\Setup\ConfigOptionsList;
-use Magento\Stomp\Setup\ConnectionValidator;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\Data\ConfigData;
 use Magento\Framework\Setup\Option\TextConfigOption;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Stomp\Setup\ConfigOptionsList;
+use Magento\Stomp\Setup\ConnectionValidator;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 

dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/DeprecatedFormat/AsyncMultiTopicsSeparateQueuesTest.php

@@ -6,8 +6,8 @@
 namespace Magento\Framework\MessageQueue\UseCase\DeprecatedFormat;
 
 use Magento\Framework\MessageQueue\DefaultValueProvider;
-use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\MessageQueue\UseCase\QueueTestCaseAbstract;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestModuleAsyncAmqp\Model\AsyncTestData;
 
 class AsyncMultiTopicsSeparateQueuesTest extends QueueTestCaseAbstract

dev/tests/integration/testsuite/Magento/Framework/Stomp/TopologyTest.php

@@ -9,8 +9,8 @@
 namespace Magento\Framework\Stomp;
 
 use Magento\Framework\MessageQueue\DefaultValueProvider;
-use Magento\TestFramework\Helper\Stomp;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Helper\Stomp;
 use Magento\TestFramework\ObjectManager;
 use PHPUnit\Framework\TestCase;