Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Common/Internal/Resources.php
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,9 @@ class Resources {
const LIST_RULES_PATH = '%s/subscriptions/%s/rules';
const LIST_SUBSCRIPTIONS_PATH = '%s/subscriptions';
const RECEIVE_MESSAGE_PATH = '%s/messages/head';
const RECEIVE_MESSAGE_DEADLETTER_PATH = '%s/$DeadLetterQueue/messages/head';
const RECEIVE_SUBSCRIPTION_MESSAGE_PATH = '%s/subscriptions/%s/messages/head';
const RECEIVE_SUBSCRIPTION_MESSAGE_DEADLETTER_PATH = '%s/subscriptions/%s/$DeadLetterQueue/messages/head';
const SEND_MESSAGE_PATH = '%s/messages';
const RULE_PATH = '%s/subscriptions/%s/rules/%s';
const SUBSCRIPTION_PATH = '%s/subscriptions/%s';
Expand Down
25 changes: 25 additions & 0 deletions src/ServiceBus/Models/ReceiveMessageOptions.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@ class ReceiveMessageOptions
*/
private $_receiveMode;

/**
* Flag to receive from deadletter instead
*
* @var bool
*/
private $deadLetter = false;

/**
* Creates a receive message option instance with default parameters.
*/
Expand Down Expand Up @@ -135,4 +142,22 @@ public function setPeekLock()
{
$this->_receiveMode = ReceiveMode::PEEK_LOCK;
}

/**
* Enable deadletter flag
*/
public function setDeadLetter()
{
$this->deadLetter = true;
}

/**
* Get deadletter flag
*
* @return bool
*/
public function getDeadLetter()
{
return $this->deadLetter;
}
}
14 changes: 12 additions & 2 deletions src/ServiceBus/ServiceBusRestProxy.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,12 @@ public function receiveQueueMessage(
$queueName,
ReceiveMessageOptions $receiveMessageOptions = null
) {
$queueMessagePath = sprintf(Resources::RECEIVE_MESSAGE_PATH, $queueName);
$pathFormat = Resources::RECEIVE_MESSAGE_PATH;
if ($receiveMessageOptions->getDeadLetter()) {
$pathFormat = Resources::RECEIVE_MESSAGE_DEADLETTER_PATH;
}

$queueMessagePath = sprintf($pathFormat, $queueName);

return $this->receiveMessage(
$queueMessagePath,
Expand Down Expand Up @@ -300,8 +305,13 @@ public function receiveSubscriptionMessage(
$subscriptionName,
ReceiveMessageOptions $receiveMessageOptions = null
) {
$pathFormat = Resources::RECEIVE_SUBSCRIPTION_MESSAGE_PATH;
if ($receiveMessageOptions->getDeadLetter()) {
$pathFormat = Resources::RECEIVE_SUBSCRIPTION_MESSAGE_DEADLETTER_PATH;
}

$messagePath = sprintf(
Resources::RECEIVE_SUBSCRIPTION_MESSAGE_PATH,
$pathFormat,
$topicName,
$subscriptionName
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,32 @@ public function testGetSetReceiveMode()
$actual
);
}

/**
* @covers \WindowsAzure\ServiceBus\Models\ReceiveMessageOptions::getDeadLetter
* @covers \WindowsAzure\ServiceBus\Models\ReceiveMessageOptions::setDeadLetter
*/
public function testGetSetDeadLetter()
{
// Setup
$receiveMessageOptions = new ReceiveMessageOptions();

// Test
$receiveMessageOptions->setDeadLetter();

// Assert
$this->assertTrue($receiveMessageOptions->getDeadLetter());
}

/**
* @covers \WindowsAzure\ServiceBus\Models\ReceiveMessageOptions::getDeadLetter
*/
public function testGetDeadLetterByDefault()
{
// Setup
$receiveMessageOptions = new ReceiveMessageOptions();

// Assert
$this->assertFalse($receiveMessageOptions->getDeadLetter());
}
}