Skip to content

Commit 7361b1d

Browse files
committed
AC-14558::Migration form RabbitMQ to Apache ActiveMQ
1 parent 3040a18 commit 7361b1d

39 files changed

+208
-111
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,8 @@ public function validate(array $options, DeploymentConfig $deploymentConfig)
205205
$errors[] = "Could not connect to the Amqp Server.";
206206
}
207207

208-
if(isset($options[self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION])
209-
&& $options[self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION] === 'stomp')
210-
{
208+
if (isset($options[self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION])
209+
&& $options[self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION] !== 'amqp') {
211210
$errors = [];
212211
}
213212
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ public function process($maxNumberOfMessages = null)
8585
if (!isset($maxNumberOfMessages)) {
8686
$queue->subscribe($this->getTransactionCallback($queue));
8787
} else {
88-
$connectionName = $this->consumerConfig->getConsumer($this->configuration->getConsumerName())->getConnection();
88+
$connectionName = $this->consumerConfig
89+
->getConsumer($this->configuration->getConsumerName())
90+
->getConnection();
8991
$this->invoker->invoke(
9092
$queue,
9193
$maxNumberOfMessages,

app/code/Magento/MessageQueue/Model/CheckIsAvailableMessagesInQueue.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2015 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

app/code/Magento/MysqlMq/Model/Driver/Queue.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ public function push(EnvelopeInterface $envelope)
161161
$envelope->getBody(),
162162
[$this->queueName]
163163
);
164+
return $envelope;
164165
}
165166

166167
/**
@@ -182,9 +183,12 @@ public function subscribeQueue()
182183
}
183184

184185
/**
186+
* Clear queue
187+
*
185188
* @return int
186189
*/
187190
public function clearQueue(): int
188191
{
192+
return 1;
189193
}
190194
}

dev/tests/integration/_files/Magento/TestModuleAsyncStomp/Model/AsyncTestData.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\TestModuleAsyncStomp\Model;
79

810
class AsyncTestData

dev/tests/integration/_files/Magento/TestModuleAsyncStomp/Model/CustomHandler.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\TestModuleAsyncStomp\Model;
79

810
class CustomHandler

dev/tests/integration/_files/Magento/TestModuleAsyncStomp/Model/RequestHandler.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\TestModuleAsyncStomp\Model;
79

810
class RequestHandler

dev/tests/integration/_files/Magento/TestModuleAsyncStomp/Model/WildCardHandler.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\TestModuleAsyncStomp\Model;
79

810
class WildCardHandler

dev/tests/integration/_files/Magento/TestModuleAsyncStomp/etc/communication.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Communication/etc/communication.xsd">

dev/tests/integration/_files/Magento/TestModuleAsyncStomp/etc/module.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">

0 commit comments

Comments
 (0)