From 5c3cf988ac1c65cb1c4d14e6105d1d05fcc47648 Mon Sep 17 00:00:00 2001 From: azure-sdk Date: Fri, 8 May 2020 21:29:37 +0000 Subject: [PATCH 1/6] Increment package version after release of com.azure azure-messaging-servicebus --- eng/jacoco-test-coverage/pom.xml | 2 +- eng/versioning/version_client.txt | 2 +- sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md | 3 +++ sdk/servicebus/azure-messaging-servicebus/pom.xml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index 1344a54204a2..0f09b7a1e604 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -129,7 +129,7 @@ com.azure azure-messaging-servicebus - 7.0.0-beta.2 + 7.0.0-beta.3 com.azure diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 6d2ddb9e2601..3ac25efa421d 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -25,7 +25,7 @@ com.azure:azure-identity;1.0.6;1.1.0-beta.4 com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-messaging-eventhubs;5.0.3;5.1.0 com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.0.3;1.1.0 -com.azure:azure-messaging-servicebus;7.0.0-beta.1;7.0.0-beta.2 +com.azure:azure-messaging-servicebus;7.0.0-beta.2;7.0.0-beta.3 com.azure:azure-search-documents;1.0.0-beta.3;1.0.0-beta.4 com.azure:azure-security-keyvault-certificates;4.1.0-beta.2;4.1.0-beta.3 com.azure:azure-security-keyvault-keys;4.2.0-beta.3;4.2.0-beta.4 diff --git a/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md b/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md index eba6c5777c96..57ea762e8c7a 100644 --- a/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md +++ b/sdk/servicebus/azure-messaging-servicebus/CHANGELOG.md @@ -1,5 +1,8 @@ # Release History +## 7.0.0-beta.3 (Unreleased) + + ## 7.0.0-beta.2 (2020-05-07) - Add support for receiving messages from specific sessions diff --git a/sdk/servicebus/azure-messaging-servicebus/pom.xml b/sdk/servicebus/azure-messaging-servicebus/pom.xml index a89e381ed309..3da98c56d190 100644 --- a/sdk/servicebus/azure-messaging-servicebus/pom.xml +++ b/sdk/servicebus/azure-messaging-servicebus/pom.xml @@ -14,7 +14,7 @@ com.azure azure-messaging-servicebus - 7.0.0-beta.2 + 7.0.0-beta.3 Microsoft Azure client library for Service Bus Libraries built on Microsoft Azure Service Bus From adedc0c4fd30557c65b1b1a7d1f8fa2aeafc5f7b Mon Sep 17 00:00:00 2001 From: Hemant Tanwar Date: Wed, 1 Jul 2020 18:12:44 -0700 Subject: [PATCH 2/6] separating resource between test --- .../ServiceBusReceiverAsyncClientIntegrationTest.java | 2 +- .../src/test/java/com/azure/messaging/servicebus/TestUtils.java | 1 + sdk/servicebus/test-resources.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java index 782cf00930ea..7e5dde205c81 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java @@ -641,7 +641,7 @@ void receiveAndComplete(MessagingEntityType entityType, boolean isSessionEnabled @ParameterizedTest void receiveAndRenewLock(MessagingEntityType entityType) { // Arrange - setSenderAndReceiver(entityType, 0, false); + setSenderAndReceiver(entityType, TestUtils.USE_CASE_RECEIVE_RENEW_LOCK, false); final String messageId = UUID.randomUUID().toString(); final ServiceBusMessage message = getMessage(messageId, false); diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/TestUtils.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/TestUtils.java index 9e945b49236c..ad0e20798d6b 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/TestUtils.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/TestUtils.java @@ -53,6 +53,7 @@ public class TestUtils { static final int USE_CASE_SINGLE_SESSION = 12; static final int USE_CASE_SEND_VIA_1 = 13; static final int USE_CASE_SEND_VIA_2 = 14; + static final int USE_CASE_RECEIVE_RENEW_LOCK = 15; // An application property key to identify where in the stream this message was created. static final String MESSAGE_POSITION_ID = "message-position"; diff --git a/sdk/servicebus/test-resources.json b/sdk/servicebus/test-resources.json index 998ed16a9598..97672339014f 100644 --- a/sdk/servicebus/test-resources.json +++ b/sdk/servicebus/test-resources.json @@ -56,7 +56,7 @@ "namespaceDomainNameSuffix": "servicebus.windows.net", "queueName": "queue", "queueSessionName": "queue-session", - "numberOfInstances": 15, + "numberOfInstances": 20, "subscriptionName": "subscription", "subscriptionSessionName": "subscription-session", "serviceBusDataOwnerRoleId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/090c5cfd-751d-490a-894a-3ce6f1109419')]", From 607d6c638b1144f17c5a4b3d6f6fa3b735fa3081 Mon Sep 17 00:00:00 2001 From: Hemant Tanwar Date: Wed, 1 Jul 2020 23:34:51 -0700 Subject: [PATCH 3/6] Fixing test --- .../ServiceBusReceiverAsyncClientIntegrationTest.java | 5 ++--- .../test/java/com/azure/messaging/servicebus/TestUtils.java | 2 -- sdk/servicebus/test-resources.json | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java index 7e5dde205c81..de0dcfcc85af 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java @@ -641,7 +641,7 @@ void receiveAndComplete(MessagingEntityType entityType, boolean isSessionEnabled @ParameterizedTest void receiveAndRenewLock(MessagingEntityType entityType) { // Arrange - setSenderAndReceiver(entityType, TestUtils.USE_CASE_RECEIVE_RENEW_LOCK, false); + setSenderAndReceiver(entityType, 0, false); final String messageId = UUID.randomUUID().toString(); final ServiceBusMessage message = getMessage(messageId, false); @@ -667,8 +667,7 @@ void receiveAndRenewLock(MessagingEntityType entityType) { assertTrue(lockedUntil.isAfter(initialLock), String.format("Updated lock is not after the initial Lock. updated: [%s]. initial:[%s]", lockedUntil, initialLock)); - - assertEquals(receivedMessage.getLockedUntil(), lockedUntil); + }) .verifyComplete(); } finally { diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/TestUtils.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/TestUtils.java index ad0e20798d6b..518f62fc3b79 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/TestUtils.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/TestUtils.java @@ -53,8 +53,6 @@ public class TestUtils { static final int USE_CASE_SINGLE_SESSION = 12; static final int USE_CASE_SEND_VIA_1 = 13; static final int USE_CASE_SEND_VIA_2 = 14; - static final int USE_CASE_RECEIVE_RENEW_LOCK = 15; - // An application property key to identify where in the stream this message was created. static final String MESSAGE_POSITION_ID = "message-position"; diff --git a/sdk/servicebus/test-resources.json b/sdk/servicebus/test-resources.json index 97672339014f..998ed16a9598 100644 --- a/sdk/servicebus/test-resources.json +++ b/sdk/servicebus/test-resources.json @@ -56,7 +56,7 @@ "namespaceDomainNameSuffix": "servicebus.windows.net", "queueName": "queue", "queueSessionName": "queue-session", - "numberOfInstances": 20, + "numberOfInstances": 15, "subscriptionName": "subscription", "subscriptionSessionName": "subscription-session", "serviceBusDataOwnerRoleId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/090c5cfd-751d-490a-894a-3ce6f1109419')]", From 3810785f20d12d9fcc01a7059d7cee26d8caaf43 Mon Sep 17 00:00:00 2001 From: Hemant Tanwar Date: Thu, 2 Jul 2020 17:21:00 -0700 Subject: [PATCH 4/6] live test fix --- .../ServiceBusReceiverAsyncClientIntegrationTest.java | 2 +- .../ServiceBusReceiverClientIntegrationTest.java | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java index de0dcfcc85af..9a5fcf5c67ff 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverAsyncClientIntegrationTest.java @@ -667,7 +667,7 @@ void receiveAndRenewLock(MessagingEntityType entityType) { assertTrue(lockedUntil.isAfter(initialLock), String.format("Updated lock is not after the initial Lock. updated: [%s]. initial:[%s]", lockedUntil, initialLock)); - + }) .verifyComplete(); } finally { diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientIntegrationTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientIntegrationTest.java index 99368894f49c..e7de8f3d0005 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientIntegrationTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientIntegrationTest.java @@ -114,7 +114,6 @@ void multipleReceiveByOneSubscriberMessageTimeout(MessagingEntityType entityType final int maxMessages = 2; final int totalReceive = 2; final Duration shortTimeOut = Duration.ofSeconds(7); - final Duration longTimeOut = Duration.ofSeconds(10); final String messageId = UUID.randomUUID().toString(); List messageList = new ArrayList<>(); @@ -122,18 +121,13 @@ void multipleReceiveByOneSubscriberMessageTimeout(MessagingEntityType entityType messageList.add(getMessage(messageId, isSessionEnabled)); } - Mono.just(true) - .delayElement(longTimeOut) - .map(aBoolean -> { - sendMessages(messageList); - return aBoolean; - }) - .subscribe(); // Act & Assert IterableStream messages = receiver.receiveMessages(maxMessages, shortTimeOut); long received = messages.stream().count(); assertEquals(0, received); + sendMessages(messageList); + int receivedMessageCount; int totalReceivedCount = 0; for (int i = 0; i < totalReceive; ++i) { From 62c253c41f5f3720edb2078a7e580b1e3e28257a Mon Sep 17 00:00:00 2001 From: Hemant Tanwar Date: Thu, 2 Jul 2020 22:16:35 -0700 Subject: [PATCH 5/6] formatting change --- .../src/test/java/com/azure/messaging/servicebus/TestUtils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/TestUtils.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/TestUtils.java index 518f62fc3b79..9e945b49236c 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/TestUtils.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/TestUtils.java @@ -53,6 +53,7 @@ public class TestUtils { static final int USE_CASE_SINGLE_SESSION = 12; static final int USE_CASE_SEND_VIA_1 = 13; static final int USE_CASE_SEND_VIA_2 = 14; + // An application property key to identify where in the stream this message was created. static final String MESSAGE_POSITION_ID = "message-position"; From e358f685141b087b4a9a8af35280d146702ea666 Mon Sep 17 00:00:00 2001 From: Hemant Tanwar Date: Thu, 2 Jul 2020 22:39:34 -0700 Subject: [PATCH 6/6] Fix checkstyle issue --- .../servicebus/ServiceBusReceiverClientIntegrationTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientIntegrationTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientIntegrationTest.java index e7de8f3d0005..25e7bafbbd9d 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientIntegrationTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusReceiverClientIntegrationTest.java @@ -15,7 +15,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; -import reactor.core.publisher.Mono; import java.time.Duration; import java.time.Instant;