Fixed BIC for Magento\Framework\MessageQueue\Rpc\Publisher

Author: andrewbess

lib/internal/Magento/Framework/MessageQueue/Rpc/Publisher.php

@@ -3,14 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\MessageQueue\Rpc;
 
-use Magento\Framework\MessageQueue\PublisherInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\MessageQueue\EnvelopeFactory;
 use Magento\Framework\MessageQueue\ExchangeRepository;
 use Magento\Framework\MessageQueue\MessageEncoder;
 use Magento\Framework\MessageQueue\MessageValidator;
 use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+use Magento\Framework\MessageQueue\PublisherInterface;
 
 /**
  * A MessageQueue Publisher to handle publishing a message.
@@ -49,27 +51,42 @@ class Publisher implements PublisherInterface
      */
     private $publisherConfig;
 
-    //@codingStandardsIgnoreStart
     /**
      * Initialize dependencies.
      *
      * @param ExchangeRepository $exchangeRepository
      * @param EnvelopeFactory $envelopeFactory
-     * @param MessageEncoder $messageEncoder
-     * @param MessageValidator $messageValidator
+     * @param null $messageQueueConfig @deprecated obsolete dependency
+     * @param null $amqpConfig @deprecated obsolete dependency
+     * @param MessageEncoder|null $messageEncoder
+     * @param MessageValidator|null $messageValidator
+     * @param ResponseQueueNameBuilder|null $responseQueueNameBuilder
+     * @param PublisherConfig|null $publisherConfig
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         ExchangeRepository $exchangeRepository,
         EnvelopeFactory $envelopeFactory,
-        MessageEncoder $messageEncoder,
-        MessageValidator $messageValidator
+        $messageQueueConfig = null,
+        $amqpConfig = null,
+        MessageEncoder $messageEncoder = null,
+        MessageValidator $messageValidator = null,
+        ResponseQueueNameBuilder $responseQueueNameBuilder = null,
+        PublisherConfig $publisherConfig = null
     ) {
         $this->exchangeRepository = $exchangeRepository;
         $this->envelopeFactory = $envelopeFactory;
-        $this->messageEncoder = $messageEncoder;
-        $this->messageValidator = $messageValidator;
+        $objectManager = ObjectManager::getInstance();
+        $this->messageEncoder = $messageEncoder
+            ?? $objectManager->get(MessageEncoder::class);
+        $this->messageValidator = $messageValidator
+            ?? $objectManager->get(MessageValidator::class);
+        $this->responseQueueNameBuilder = $responseQueueNameBuilder
+            ?? $objectManager->get(ResponseQueueNameBuilder::class);
+        $this->publisherConfig = $publisherConfig
+            ?? $objectManager->get(PublisherConfig::class);
     }
-    //@codingStandardsIgnoreEnd
 
     /**
      * @inheritdoc
@@ -78,7 +95,7 @@ public function publish($topicName, $data)
     {
         $this->messageValidator->validate($topicName, $data);
         $data = $this->messageEncoder->encode($topicName, $data);
-        $replyTo = $this->getResponseQueueNameBuilder()->getQueueName($topicName);
+        $replyTo = $this->responseQueueNameBuilder->getQueueName($topicName);
         $envelope = $this->envelopeFactory->create(
             [
                 'body' => $data,
@@ -92,40 +109,9 @@ public function publish($topicName, $data)
                 ]
             ]
         );
-        $connectionName = $this->getPublisherConfig()->getPublisher($topicName)->getConnection()->getName();
+        $connectionName = $this->publisherConfig->getPublisher($topicName)->getConnection()->getName();
         $exchange = $this->exchangeRepository->getByConnectionName($connectionName);
         $responseMessage = $exchange->enqueue($topicName, $envelope);
         return $this->messageEncoder->decode($topicName, $responseMessage, false);
     }
-
-    /**
-     * Get response queue name builder.
-     *
-     * @return ResponseQueueNameBuilder
-     *
-     * @deprecated 103.0.0
-     */
-    private function getResponseQueueNameBuilder()
-    {
-        if ($this->responseQueueNameBuilder === null) {
-            $this->responseQueueNameBuilder = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(ResponseQueueNameBuilder::class);
-        }
-        return $this->responseQueueNameBuilder;
-    }
-
-    /**
-     * Get publisher config.
-     *
-     * @return PublisherConfig
-     *
-     * @deprecated 103.0.0
-     */
-    private function getPublisherConfig()
-    {
-        if ($this->publisherConfig === null) {
-            $this->publisherConfig = \Magento\Framework\App\ObjectManager::getInstance()->get(PublisherConfig::class);
-        }
-        return $this->publisherConfig;
-    }
 }