Skip to content

Commit ea4ad0d

Browse files
authored
[Service Bus] Remove ReceiveMode from public API surface (Azure#12557)
1 parent 16574a3 commit ea4ad0d

File tree

9 files changed

+20
-19
lines changed

9 files changed

+20
-19
lines changed

sdk/servicebus/service-bus/review/service-bus.api.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,6 @@ export interface ReceiveMessagesOptions extends OperationOptionsBase {
217217
maxWaitTimeInMs?: number;
218218
}
219219

220-
// @public
221-
export type ReceiveMode = "peekLock" | "receiveAndDelete";
222-
223220
export { RetryOptions }
224221

225222
// @public
@@ -439,7 +436,7 @@ export interface ServiceBusReceiver {
439436
// @public
440437
export interface ServiceBusReceiverOptions {
441438
maxAutoLockRenewalDurationInMs?: number;
442-
receiveMode?: ReceiveMode;
439+
receiveMode?: "peekLock" | "receiveAndDelete";
443440
subQueueType?: "deadLetter" | "transferDeadLetter";
444441
}
445442

@@ -470,7 +467,7 @@ export interface ServiceBusSessionReceiver extends ServiceBusReceiver {
470467
// @public
471468
export interface ServiceBusSessionReceiverOptions extends OperationOptionsBase {
472469
maxAutoLockRenewalDurationInMs?: number;
473-
receiveMode?: ReceiveMode;
470+
receiveMode?: "peekLock" | "receiveAndDelete";
474471
}
475472

476473
// @public

sdk/servicebus/service-bus/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export {
1919
ProcessErrorArgs,
2020
PeekMessagesOptions,
2121
ReceiveMessagesOptions,
22-
ReceiveMode,
2322
SubscribeOptions
2423
} from "./models";
2524
export { OperationOptionsBase, TryAddOptions } from "./modelsToBeSharedWithEventHubs";

sdk/servicebus/service-bus/src/models.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ export interface InternalMessageHandlers extends MessageHandlers {
6767

6868
/**
6969
* Represents the possible receive modes for the receiver.
70+
* @internal
71+
* @ignore
7072
*/
7173
export type ReceiveMode = "peekLock" | "receiveAndDelete";
7274

@@ -93,7 +95,7 @@ export interface ServiceBusReceiverOptions {
9395
* https://docs.microsoft.com/azure/service-bus-messaging/message-transfers-locks-settlement#peeklock
9496
*
9597
*/
96-
receiveMode?: ReceiveMode;
98+
receiveMode?: "peekLock" | "receiveAndDelete";
9799
/**
98100
* Represents the sub queue that is applicable for any queue or subscription.
99101
* Valid values are "deadLetter" and "transferDeadLetter". To learn more about dead letter queues,
@@ -191,7 +193,7 @@ export interface ServiceBusSessionReceiverOptions extends OperationOptionsBase {
191193
* https://docs.microsoft.com/azure/service-bus-messaging/message-transfers-locks-settlement#peeklock
192194
*
193195
*/
194-
receiveMode?: ReceiveMode;
196+
receiveMode?: "peekLock" | "receiveAndDelete";
195197
/**
196198
* @property The maximum duration in milliseconds
197199
* until which, the lock on the session will be renewed automatically by the sdk.

sdk/servicebus/service-bus/src/receivers/receiver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export interface ServiceBusReceiver {
132132
*/
133133
entityPath: string;
134134
/**
135-
* ReceiveMode provided to the client.
135+
* The receive mode used to create the receiver.
136136
*/
137137
receiveMode: "peekLock" | "receiveAndDelete";
138138
/**

sdk/servicebus/service-bus/src/serviceBusMessage.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,9 @@ export interface ServiceBusReceivedMessage extends ServiceBusMessage {
370370
readonly deadLetterErrorDescription?: string;
371371
/**
372372
* @property The lock token is a reference to the lock that is being held by the broker in
373-
* `ReceiveMode.PeekLock` mode. Locks are used internally settle messages as explained in the
373+
* `peekLock` receive mode. Locks are used internally settle messages as explained in the
374374
* {@link https://docs.microsoft.com/azure/service-bus-messaging/message-transfers-locks-settlement product documentation in more detail}
375-
* - Not applicable when the message is received in `ReceiveMode.receiveAndDelete`
375+
* - Not applicable when the message is received in `receiveAndDelete` receive mode.
376376
* mode.
377377
* @readonly
378378
*/
@@ -399,7 +399,7 @@ export interface ServiceBusReceivedMessage extends ServiceBusMessage {
399399
* @property The UTC instant until which the message is held locked in the queue/subscription.
400400
* When the lock expires, the `deliveryCount` is incremented and the message is again available
401401
* for retrieval.
402-
* - Not applicable when the message is received in `ReceiveMode.receiveAndDelete`
402+
* - Not applicable when the message is received in `receiveAndDelete` receive mode.
403403
* mode.
404404
*/
405405
lockedUntilUtc?: Date;
@@ -682,9 +682,9 @@ export class ServiceBusMessageImpl implements ServiceBusReceivedMessage {
682682
scheduledEnqueueTimeUtc?: Date;
683683
/**
684684
* @property The lock token is a reference to the lock that is being held by the broker in
685-
* `ReceiveMode.PeekLock` mode. Locks are used internally settle messages as explained in the
685+
* `peekLock` receive mode. Locks are used internally settle messages as explained in the
686686
* {@link https://docs.microsoft.com/azure/service-bus-messaging/message-transfers-locks-settlement product documentation in more detail}
687-
* - Not applicable when the message is received in `ReceiveMode.receiveAndDelete`
687+
* - Not applicable when the message is received in `receiveAndDelete` receive mode.
688688
* mode.
689689
* @readonly
690690
*/
@@ -711,7 +711,7 @@ export class ServiceBusMessageImpl implements ServiceBusReceivedMessage {
711711
* @property The UTC instant until which the message is held locked in the queue/subscription.
712712
* When the lock expires, the `deliveryCount` is incremented and the message is again available
713713
* for retrieval.
714-
* - Not applicable when the message is received in `ReceiveMode.receiveAndDelete`
714+
* - Not applicable when the message is received in `receiveAndDelete` receive mode.
715715
* mode.
716716
*/
717717
lockedUntilUtc?: Date;

sdk/servicebus/service-bus/test/internal/abortSignal.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ import { isLinkLocked } from "../utils/misc";
2424
import { ServiceBusSessionReceiverImpl } from "../../src/receivers/sessionReceiver";
2525
import { ServiceBusReceiverImpl } from "../../src/receivers/receiver";
2626
import { MessageSession } from "../../src/session/messageSession";
27-
import { ProcessErrorArgs, ReceiveMode } from "../../src";
27+
import { ProcessErrorArgs } from "../../src";
28+
import { ReceiveMode } from "../../src/models";
2829

2930
describe("AbortSignal", () => {
3031
const defaultOptions = {

sdk/servicebus/service-bus/test/internal/batchingReceiver.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { OnAmqpEventAsPromise } from "../../src/core/messageReceiver";
3131
import { ConnectionContext } from "../../src/connectionContext";
3232
import { ServiceBusReceiverImpl } from "../../src/receivers/receiver";
3333
import { OperationOptionsBase } from "../../src/modelsToBeSharedWithEventHubs";
34-
import { ReceiveMode } from "../../src";
34+
import { ReceiveMode } from "../../src/models";
3535

3636
describe("BatchingReceiver unit tests", () => {
3737
let closeables: { close(): Promise<void> }[];

sdk/servicebus/service-bus/test/internal/messageSession.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ import {
2020
} from "rhea-promise";
2121
import { OnAmqpEventAsPromise } from "../../src/core/messageReceiver";
2222
import { ServiceBusMessageImpl } from "../../src/serviceBusMessage";
23-
import { ProcessErrorArgs, ReceiveMode } from "../../src";
23+
import { ProcessErrorArgs } from "../../src";
24+
import { ReceiveMode } from "../../src/models";
2425
import { Constants } from "@azure/core-amqp";
2526

2627
chai.use(chaiAsPromised);

sdk/servicebus/service-bus/test/internal/streamingReceiver.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
import chai from "chai";
55
import chaiAsPromised from "chai-as-promised";
66
import { createConnectionContextForTests } from "./unittestUtils";
7-
import { ProcessErrorArgs, ReceiveMode } from "../../src";
7+
import { ProcessErrorArgs } from "../../src";
8+
import { ReceiveMode } from "../../src/models";
89
import { StreamingReceiver, StreamingReceiverError } from "../../src/core/streamingReceiver";
910
import sinon from "sinon";
1011
import { EventContext } from "rhea-promise";

0 commit comments

Comments
 (0)