Skip to content

Pass associatedLinkName to updateDispositionStatus() API #2787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ramya-rao-a merged 8 commits into from
May 15, 2019
Merged

Pass associatedLinkName to updateDispositionStatus() API #2787

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f7899cd
Pass associatedLinkName to updateDispositionStatus() API
May 9, 2019
24d2e52
Combine if-else
May 9, 2019
dd71f9b
Use private helper
May 10, 2019
442bc79
Move helper to util and update 7 other usages
May 10, 2019
054ddc6
Address comments
May 13, 2019
44ee9a3
Merge branch 'master' into issue-2611-v2
ramya0820 May 13, 2019
355fb6d
Merge branch 'master' into issue-2611-v2
ramya0820 May 14, 2019
558fbcc
Merge branch 'master' into issue-2611-v2
ramya0820 May 14, 2019
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
4 changes: 4 additions & 0 deletions sdk/servicebus/service-bus/src/core/managementClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,7 @@ export class ManagementClient extends LinkEntity {
async updateDispositionStatus(
lockToken: string,
dispositionStatus: DispositionStatus,
associatedLinkName?: string,
options?: DispositionStatusOptions
): Promise<void> {
throwErrorIfConnectionClosed(this._context.namespace);
Expand Down Expand Up @@ -757,6 +758,9 @@ export class ManagementClient extends LinkEntity {
operation: Constants.operations.updateDisposition
}
};
if (associatedLinkName) {
request.application_properties![Constants.associatedLinkName] = associatedLinkName;
}
request.application_properties![Constants.trackingId] = generate_uuid();
log.mgmt(
"[%s] Update disposition status request body: %O.",
Expand Down
48 changes: 48 additions & 0 deletions sdk/servicebus/service-bus/src/serviceBusMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,9 +817,21 @@ export class ServiceBusMessage implements ReceivedMessage {
this.messageId
);
if (this._context.requestResponseLockedMessages.has(this.lockToken!)) {
let receiverName;
if (this._context.batchingReceiver) {
receiverName = this._context.batchingReceiver.name;
} else if (this._context.streamingReceiver) {
receiverName = this._context.streamingReceiver.name;
}

if (this.sessionId) {
receiverName = this._context.messageSessions[this.sessionId].name;
}
Comment thread
ramya-rao-a marked this conversation as resolved.
Outdated

await this._context.managementClient!.updateDispositionStatus(
this.lockToken!,
DispositionStatus.completed,
receiverName,
{
sessionId: this.sessionId
}
Expand Down Expand Up @@ -849,9 +861,21 @@ export class ServiceBusMessage implements ReceivedMessage {
this.messageId
);
if (this._context.requestResponseLockedMessages.has(this.lockToken!)) {
let receiverName;
if (this._context.batchingReceiver) {
receiverName = this._context.batchingReceiver.name;
} else if (this._context.streamingReceiver) {
receiverName = this._context.streamingReceiver.name;
}

if (this.sessionId) {
receiverName = this._context.messageSessions[this.sessionId].name;
}

await this._context.managementClient!.updateDispositionStatus(
this.lockToken!,
DispositionStatus.abandoned,
receiverName,
{ propertiesToModify: propertiesToModify, sessionId: this.sessionId }
);

Expand Down Expand Up @@ -881,9 +905,21 @@ export class ServiceBusMessage implements ReceivedMessage {
this.messageId
);
if (this._context.requestResponseLockedMessages.has(this.lockToken!)) {
let receiverName;
if (this._context.batchingReceiver) {
receiverName = this._context.batchingReceiver.name;
} else if (this._context.streamingReceiver) {
receiverName = this._context.streamingReceiver.name;
}

if (this.sessionId) {
receiverName = this._context.messageSessions[this.sessionId].name;
}

await this._context.managementClient!.updateDispositionStatus(
this.lockToken!,
DispositionStatus.defered,
receiverName,
{ propertiesToModify: propertiesToModify, sessionId: this.sessionId }
);

Expand Down Expand Up @@ -923,9 +959,21 @@ export class ServiceBusMessage implements ReceivedMessage {
this.messageId
);
if (this._context.requestResponseLockedMessages.has(this.lockToken!)) {
let receiverName;
if (this._context.batchingReceiver) {
receiverName = this._context.batchingReceiver.name;
} else if (this._context.streamingReceiver) {
receiverName = this._context.streamingReceiver.name;
}

if (this.sessionId) {
receiverName = this._context.messageSessions[this.sessionId].name;
}

await this._context.managementClient!.updateDispositionStatus(
this.lockToken!,
DispositionStatus.suspended,
receiverName,
{
deadLetterReason: error.condition,
deadLetterDescription: error.description,
Expand Down