From 773bf802208a9c1a2870cb51756e66d822bbc1c0 Mon Sep 17 00:00:00 2001 From: Zejia Jiang Date: Fri, 28 Oct 2022 16:02:34 +0800 Subject: [PATCH 1/3] fix typo --- .vscode/cspell.json | 9 ++++++++- sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md | 4 ++-- sdk/servicebus/azure-messaging-servicebus/README.md | 4 ++-- .../azure-messaging-servicebus/migration-guide.md | 2 +- .../azure/messaging/servicebus/FluxAutoLockRenew.java | 2 +- .../servicebus/ServiceBusReceiverAsyncClient.java | 4 ++-- .../messaging/servicebus/ServiceBusReceiverClient.java | 2 +- .../administration/models/AuthorizationRule.java | 2 +- .../administration/models/CorrelationRuleFilter.java | 2 +- .../servicebus/administration/models/SqlRuleAction.java | 2 +- .../servicebus/administration/models/SqlRuleFilter.java | 2 +- .../messaging/servicebus/DeadletterQueueSample.java | 2 +- .../servicebus/SendSessionMessageAsyncSample.java | 2 +- 13 files changed, 23 insertions(+), 16 deletions(-) diff --git a/.vscode/cspell.json b/.vscode/cspell.json index 863a4dd252b3..0c5d01887c5b 100644 --- a/.vscode/cspell.json +++ b/.vscode/cspell.json @@ -177,7 +177,6 @@ "sdk/schemaregistry/azure-data-schemaregistry-apacheavro/**", "sdk/servicebus/build/**", "sdk/spring/scripts/**", - "sdk/servicebus/azure-messaging-servicebus/**", "sdk/spring/spring-cloud-azure-actuator/**", "sdk/spring/spring-cloud-azure-actuator-autoconfigure/**", "sdk/spring/spring-cloud-azure-integration-tests/**", @@ -671,6 +670,14 @@ "RAGRS", "saoid" ] + }, + { + "filename": "sdk/servicebus/azure-messaging-servicebus/**", + "words": [ + "Conniey", + "qpid", + "unretriable" + ] } ], "allowCompoundWords": true diff --git a/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md b/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md index c9aa709ecad8..ba42bbe73a9b 100644 --- a/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md +++ b/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md @@ -327,7 +327,7 @@ Fixed the issue that the second call of `ServiceBusReceiverClient.complete` is s ### Breaking Changes - Changed `receiveMessages` API to return `ServiceBusReceivedMessage` instead of ServiceBusReceivedMessageContext in - `ServiceBusReceiverAsynClient` and `ServiceBusReceiverClient`. + `ServiceBusReceiverAsyncClient` and `ServiceBusReceiverClient`. - Removed `SendVia` option from `ServiceBusClientBuilder`. See issue for more detail [16942](https://github.com/Azure/azure-sdk-for-java/pull/16942). - Removed `sessionId` setting from `ServiceBusSessionReceiverClientBuilder` as creating receiver clients bound to a @@ -337,7 +337,7 @@ Fixed the issue that the second call of `ServiceBusReceiverClient.complete` is s `ServiceBusSessionProcessorClientBuilder` as the feature of receiving messages from multiple sessions is moved from the receiver client to the new `ServiceBusSessionProcessorClient`. - Renamed `tryAdd` to `tryAddMessage` in `ServiceBusMessageBatch`. -- Removed `sessionId` specific methods from `ServiceBusReceiverAsynClient` and `ServiceBusReceiverClient` because now +- Removed `sessionId` specific methods from `ServiceBusReceiverAsyncClient` and `ServiceBusReceiverClient` because now receiver client is always tied to one session. ### Bug Fixes diff --git a/sdk/servicebus/azure-messaging-servicebus/README.md b/sdk/servicebus/azure-messaging-servicebus/README.md index 6b6a75e76e6e..218378e01fa6 100644 --- a/sdk/servicebus/azure-messaging-servicebus/README.md +++ b/sdk/servicebus/azure-messaging-servicebus/README.md @@ -423,7 +423,7 @@ The recommended way to solve the specific exception the AMQP exception represent ### Understanding the APIs behavior -The document [here][sync_receivemessages_implcit_prefetch] provides insights into the expected behavior of synchronous `receiveMessages` API when using it to obtain more than one message (a.k.a. implicit prefetching). +The document [here][sync_receivemessages_implicit_prefetch] provides insights into the expected behavior of synchronous `receiveMessages` API when using it to obtain more than one message (a.k.a. implicit prefetching). ## Next steps @@ -475,7 +475,7 @@ Guidelines](https://github.com/Azure/azure-sdk-for-java/blob/main/CONTRIBUTING.m [topic_concept]: https://docs.microsoft.com/azure/service-bus-messaging/service-bus-messaging-overview#topics [wiki_identity]: https://github.com/Azure/azure-sdk-for-java/wiki/Identity-and-Authentication [known-issue-binarydata-notfound]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/servicebus/azure-messaging-servicebus/known-issues.md#can-not-resolve-binarydata-or-noclassdeffounderror-version-700 -[sync_receivemessages_implcit_prefetch]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/servicebus/azure-messaging-servicebus/docs/SyncReceiveAndPrefetch.md +[sync_receivemessages_implicit_prefetch]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/servicebus/azure-messaging-servicebus/docs/SyncReceiveAndPrefetch.md [peek_lock_mode_docs]: https://learn.microsoft.com/azure/service-bus-messaging/message-transfers-locks-settlement#peeklock [receive_and_delete_mode_docs]: https://learn.microsoft.com/azure/service-bus-messaging/message-transfers-locks-settlement#receiveanddelete ![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-java%2Fsdk%2Fservicebus%2Fazure-messaging-servicebus%2FREADME.png) diff --git a/sdk/servicebus/azure-messaging-servicebus/migration-guide.md b/sdk/servicebus/azure-messaging-servicebus/migration-guide.md index 6e0f48fc3748..b3ae92053ae6 100644 --- a/sdk/servicebus/azure-messaging-servicebus/migration-guide.md +++ b/sdk/servicebus/azure-messaging-servicebus/migration-guide.md @@ -304,7 +304,7 @@ try { ``` The new Java SDK provides a dedicated processor client to which you can pass your message and error handlers. -Like the older SDK, this supports auto completion of messages and automatica renewal of message/session locks. +Like the older SDK, this supports auto completion of messages and automatically renewal of message/session locks. For a more fine grained control and advanced features, you still have the `ServiceBusReceiverClient` and it's async counterpart `ServiceBusReceiverAsyncClient`. diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/FluxAutoLockRenew.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/FluxAutoLockRenew.java index e37b21fc4b35..b8c2841a511a 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/FluxAutoLockRenew.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/FluxAutoLockRenew.java @@ -41,7 +41,7 @@ final class FluxAutoLockRenew extends FluxOperator source, ReceiverOptions receiverOptions, diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java index 894f16b7bdff..a9d615aaef31 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java @@ -1308,8 +1308,8 @@ public void close() { } try { - // releated with issue https://github.com/Azure/azure-sdk-for-java/issues/25709. When defining ServiceBusProcessorClient as bean in SpringBoot application and throw error in processMessage(), the application can not be shutdown gracefully using ctrl-c. - // The cause is completionLock's acquire stucks. So we add a timeout for acquiring lock here to avoid the stuck. + // Related with issue https://github.com/Azure/azure-sdk-for-java/issues/25709. When defining ServiceBusProcessorClient as bean in SpringBoot application and throw error in processMessage(), the application can not be shutdown gracefully using ctrl-c. + // The cause is completionLock's acquire stuck. So we add a timeout for acquiring lock here to avoid the stuck. boolean acquired = completionLock.tryAcquire(5, TimeUnit.SECONDS); if (!acquired) { LOGGER.info("Unable to obtain completion lock."); diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverClient.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverClient.java index 163a9da065d6..41df2b9d44fa 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverClient.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverClient.java @@ -749,7 +749,7 @@ public void commitTransaction(ServiceBusTransactionContext transactionContext) { * * @param transactionContext The transaction to be rollback. * - * @throws IllegalStateException if the receiver is alread disposed. + * @throws IllegalStateException if the receiver is already disposed. * @throws NullPointerException if {@code transactionContext} or {@code transactionContext.transactionId} is null. * @throws ServiceBusException if the transaction could not be rolled back. */ diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/AuthorizationRule.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/AuthorizationRule.java index 374f56e043fd..483c89f5b897 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/AuthorizationRule.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/AuthorizationRule.java @@ -45,7 +45,7 @@ public interface AuthorizationRule { /** * Gets the name of the authorization rule. * - * @return name of the authoriation rule. + * @return name of the authorization rule. */ String getKeyName(); diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CorrelationRuleFilter.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CorrelationRuleFilter.java index e3cfc72fb9a1..6dfa49558f37 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CorrelationRuleFilter.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CorrelationRuleFilter.java @@ -32,7 +32,7 @@ * match. *

* This provides an efficient shortcut for declarations of filters that deal only with correlation - * equality. In this case the cost of the lexigraphical analysis of the expression can be avoided. Not only will + * equality. In this case the cost of the lexicographical analysis of the expression can be avoided. Not only will * correlation filters be optimized at declaration time, but they will also be optimized at runtime. Correlation filter * matching can be reduced to a hashtable lookup, which aggregates the complexity of the set of defined correlation * filters to O(1). diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleAction.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleAction.java index 20156b2b8bcd..c7660cae4f92 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleAction.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleAction.java @@ -46,7 +46,7 @@ public SqlRuleAction(String sqlExpression) { } /** - * Package private constructor for creating a model deserialised from the service. + * Package private constructor for creating a model deserialized from the service. * * @param sqlExpression SQL expression for the action. * @param compatibilityLevel The compatibility level. diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleFilter.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleFilter.java index 3bc9db4c7778..817998655331 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleFilter.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/SqlRuleFilter.java @@ -53,7 +53,7 @@ public SqlRuleFilter(String sqlExpression) { } /** - * Package private constructor for creating a model deserialised from the service. + * Package private constructor for creating a model deserialized from the service. * * @param sqlExpression SQL expression for the filter. * @param compatibilityLevel The compatibility level. diff --git a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/DeadletterQueueSample.java b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/DeadletterQueueSample.java index a55aa2d0aeab..ef1feda439c8 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/DeadletterQueueSample.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/DeadletterQueueSample.java @@ -46,7 +46,7 @@ public class DeadletterQueueSample { new Person("Faraday", "Michael"), new Person("Galilei", "Galileo"), new Person("Kepler", "Johannes"), - new Person("Kopernikus", "Nikolaus") + new Person("Copernicus", "Nikola") ); /** diff --git a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/SendSessionMessageAsyncSample.java b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/SendSessionMessageAsyncSample.java index 38e3ce2b0ee6..df335e2bc10d 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/SendSessionMessageAsyncSample.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/SendSessionMessageAsyncSample.java @@ -74,7 +74,7 @@ public void run() throws InterruptedException { List messages = Arrays.asList( new ServiceBusMessage(BinaryData.fromBytes("Hello".getBytes(UTF_8))).setSessionId(sessionId), new ServiceBusMessage(BinaryData.fromBytes("Bonjour".getBytes(UTF_8))).setSessionId(sessionId), - new ServiceBusMessage(BinaryData.fromBytes("Guten tag".getBytes(UTF_8))).setSessionId(sessionId) + new ServiceBusMessage(BinaryData.fromBytes("Gluten tag".getBytes(UTF_8))).setSessionId(sessionId) ); // This sends all the messages in a single message batch. From d3b0bfbc2aad346a5daf87c5ee4f4acc3d78bb15 Mon Sep 17 00:00:00 2001 From: Zejia Jiang <96095733+ZejiaJiang@users.noreply.github.com> Date: Tue, 1 Nov 2022 08:37:40 +0800 Subject: [PATCH 2/3] Update sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java Co-authored-by: Kishore Rajasekar <86338791+ki1729@users.noreply.github.com> --- .../messaging/servicebus/ServiceBusReceiverAsyncClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java index a9d615aaef31..a1a909b7b728 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java @@ -1309,7 +1309,7 @@ public void close() { try { // Related with issue https://github.com/Azure/azure-sdk-for-java/issues/25709. When defining ServiceBusProcessorClient as bean in SpringBoot application and throw error in processMessage(), the application can not be shutdown gracefully using ctrl-c. - // The cause is completionLock's acquire stuck. So we add a timeout for acquiring lock here to avoid the stuck. + // The cause is completionLock's acquire method is stuck. So we have added a timeout for acquiring the lock, to work around the issue. boolean acquired = completionLock.tryAcquire(5, TimeUnit.SECONDS); if (!acquired) { LOGGER.info("Unable to obtain completion lock."); From 8e234078bb926dbe033a0e22a84cc22714801840 Mon Sep 17 00:00:00 2001 From: Zejia Jiang Date: Tue, 1 Nov 2022 10:50:54 +0800 Subject: [PATCH 3/3] remove & fix typo --- .../administration/models/CreateSubscriptionOptions.java | 2 +- .../messaging/servicebus/SendSessionMessageAsyncSample.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptions.java b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptions.java index 796a4ff77763..d7e5d8921761 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptions.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/main/java/com/azure/messaging/servicebus/administration/models/CreateSubscriptionOptions.java @@ -377,7 +377,7 @@ public RuleProperties getDefaultRule() { } /*** - * Set the rule that the subscriptions hould be created with, if any. + * Set the rule that the subscriptions should be created with, if any. * * @param ruleProperties the rule description (name, action, filter) * diff --git a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/SendSessionMessageAsyncSample.java b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/SendSessionMessageAsyncSample.java index df335e2bc10d..ab26b92bfdd9 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/SendSessionMessageAsyncSample.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/samples/java/com/azure/messaging/servicebus/SendSessionMessageAsyncSample.java @@ -73,8 +73,7 @@ public void run() throws InterruptedException { // Setting the sessionId parameter ensures all messages end up in the same session and are received in order. List messages = Arrays.asList( new ServiceBusMessage(BinaryData.fromBytes("Hello".getBytes(UTF_8))).setSessionId(sessionId), - new ServiceBusMessage(BinaryData.fromBytes("Bonjour".getBytes(UTF_8))).setSessionId(sessionId), - new ServiceBusMessage(BinaryData.fromBytes("Gluten tag".getBytes(UTF_8))).setSessionId(sessionId) + new ServiceBusMessage(BinaryData.fromBytes("Bonjour".getBytes(UTF_8))).setSessionId(sessionId) ); // This sends all the messages in a single message batch.