Review feedback:improve changelog, use UTC time

Azure · Jun 6, 2024 · c32b921 · c32b921
1 parent efcebac
commit c32b921
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md b/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### Features Added
 
-- Added the support for batch-delete APIs in Receiver client.
+- Added the support for batch delete APIs in `ServiceBusReceiverClient` and `ServiceBusReceiverAsyncClient`.
 
 ### Breaking Changes
 

diff --git a/...ervicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java b/...ervicebus/src/main/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClient.java
@@ -43,6 +43,7 @@
 
 import java.time.Duration;
 import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
@@ -1545,7 +1546,7 @@ public Mono<Integer> purgeMessages(PurgeMessagesOptions options) {
                 .setBeforeEnqueueTimeUtc(options.getBeforeEnqueueTimeUtc());
         } else {
             deleteMessagesOptions = new DeleteMessagesOptions()
-                .setBeforeEnqueueTimeUtc(OffsetDateTime.now());
+                .setBeforeEnqueueTimeUtc(OffsetDateTime.now(ZoneOffset.UTC));
         }
         return deleteMessages(MAX_DELETE_MESSAGES_COUNT, deleteMessagesOptions, receiverOptions.getSessionId())
             .expand(deleted -> {
@@ -1592,7 +1593,7 @@ private Mono<Integer> deleteMessages(int messageCount, DeleteMessagesOptions opt
         if (options.getBeforeEnqueueTimeUtc() != null) {
             beforeEnqueueTimeUtc = options.getBeforeEnqueueTimeUtc();
         } else {
-            beforeEnqueueTimeUtc = OffsetDateTime.now();
+            beforeEnqueueTimeUtc = OffsetDateTime.now(ZoneOffset.UTC);
         }
         final Mono<Integer> deleteMessages = connectionProcessor
             .flatMap(connection -> connection.getManagementNode(entityPath, entityType))

diff --git a/...est/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java b/...est/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java
@@ -38,6 +38,7 @@
 import java.nio.charset.Charset;
 import java.time.Duration;
 import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -1479,7 +1480,8 @@ void purgeMessages() {
             .verifyComplete();
 
         final PurgeMessagesOptions options = new PurgeMessagesOptions()
-            .setBeforeEnqueueTimeUtc(OffsetDateTime.now().plusSeconds(5)); // 5-sec buffer to account for any clock skew.
+            // 5-sec buffer to account for any clock skew.
+            .setBeforeEnqueueTimeUtc(OffsetDateTime.now(ZoneOffset.UTC).plusSeconds(5));
 
         // since the service can delete upto 4000 messages in a single batch, the purge operation will make
         // 3 batch delete API calls to delete the 8200 messages.