From 3ff1fc2492b68506a5b8e1af9ebe6ab1eec5ecb9 Mon Sep 17 00:00:00 2001
From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Date: Thu, 19 Nov 2020 18:03:01 -0800
Subject: [PATCH 1/5] Add EnablePartitioning to QueueProperties ctor; rename
GetRawMessage
---
...ure.Messaging.ServiceBus.netstandard2.0.cs | 8 ++---
.../src/Administration/QueueProperties.cs | 1 +
.../src/Primitives/ServiceBusMessage.cs | 2 +-
.../src/Primitives/ServiceBusModelFactory.cs | 10 ++++--
.../Primitives/ServiceBusReceivedMessage.cs | 2 +-
.../Administration/QueuePropertiesTests.cs | 31 ++++++++++++++++++-
.../Administration/RulePropertiesTests.cs | 13 ++++++++
.../ServiceBusManagementClientLiveTests.cs | 4 +--
.../SubscriptionPropertiesTests.cs | 22 +++++++++++++
.../Administration/TopicPropertiesTests.cs | 25 ++++++++++++++-
.../tests/Message/MessageLiveTests.cs | 12 +++----
11 files changed, 111 insertions(+), 19 deletions(-)
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/api/Azure.Messaging.ServiceBus.netstandard2.0.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/api/Azure.Messaging.ServiceBus.netstandard2.0.cs
index 82d3d2f9f251..152ea50e8cc1 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/api/Azure.Messaging.ServiceBus.netstandard2.0.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/api/Azure.Messaging.ServiceBus.netstandard2.0.cs
@@ -168,7 +168,7 @@ public ServiceBusMessage(string body) { }
public string Subject { get { throw null; } set { } }
public System.TimeSpan TimeToLive { get { throw null; } set { } }
public string To { get { throw null; } set { } }
- public Azure.Core.Amqp.AmqpAnnotatedMessage GetRawMessage() { throw null; }
+ public Azure.Core.Amqp.AmqpAnnotatedMessage GetRawAmqpMessage() { throw null; }
public override string ToString() { throw null; }
}
public sealed partial class ServiceBusMessageBatch : System.IDisposable
@@ -184,7 +184,7 @@ public void Dispose() { }
public static partial class ServiceBusModelFactory
{
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
- public static Azure.Messaging.ServiceBus.Administration.QueueProperties QueueProperties(string name, System.TimeSpan lockDuration = default(System.TimeSpan), long maxSizeInMegabytes = (long)0, bool requiresDuplicateDetection = false, bool requiresSession = false, System.TimeSpan defaultMessageTimeToLive = default(System.TimeSpan), System.TimeSpan autoDeleteOnIdle = default(System.TimeSpan), bool deadLetteringOnMessageExpiration = false, System.TimeSpan duplicateDetectionHistoryTimeWindow = default(System.TimeSpan), int maxDeliveryCount = 0, bool enableBatchedOperations = false, Azure.Messaging.ServiceBus.Administration.EntityStatus status = default(Azure.Messaging.ServiceBus.Administration.EntityStatus), string forwardTo = null, string forwardDeadLetteredMessagesTo = null, string userMetadata = null) { throw null; }
+ public static Azure.Messaging.ServiceBus.Administration.QueueProperties QueueProperties(string name, System.TimeSpan lockDuration = default(System.TimeSpan), long maxSizeInMegabytes = (long)0, bool requiresDuplicateDetection = false, bool requiresSession = false, System.TimeSpan defaultMessageTimeToLive = default(System.TimeSpan), System.TimeSpan autoDeleteOnIdle = default(System.TimeSpan), bool deadLetteringOnMessageExpiration = false, System.TimeSpan duplicateDetectionHistoryTimeWindow = default(System.TimeSpan), int maxDeliveryCount = 0, bool enableBatchedOperations = false, Azure.Messaging.ServiceBus.Administration.EntityStatus status = default(Azure.Messaging.ServiceBus.Administration.EntityStatus), string forwardTo = null, string forwardDeadLetteredMessagesTo = null, string userMetadata = null, bool enablePartitioning = false) { throw null; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public static Azure.Messaging.ServiceBus.Administration.RuleProperties RuleProperties(string name, Azure.Messaging.ServiceBus.Administration.RuleFilter filter = null, Azure.Messaging.ServiceBus.Administration.RuleAction action = null) { throw null; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
@@ -192,7 +192,7 @@ public static partial class ServiceBusModelFactory
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public static Azure.Messaging.ServiceBus.Administration.SubscriptionProperties SubscriptionProperties(string topicName, string subscriptionName, System.TimeSpan lockDuration = default(System.TimeSpan), bool requiresSession = false, System.TimeSpan defaultMessageTimeToLive = default(System.TimeSpan), System.TimeSpan autoDeleteOnIdle = default(System.TimeSpan), bool deadLetteringOnMessageExpiration = false, int maxDeliveryCount = 0, bool enableBatchedOperations = false, Azure.Messaging.ServiceBus.Administration.EntityStatus status = default(Azure.Messaging.ServiceBus.Administration.EntityStatus), string forwardTo = null, string forwardDeadLetteredMessagesTo = null, string userMetadata = null) { throw null; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
- public static Azure.Messaging.ServiceBus.Administration.TopicProperties TopicProperties(string name, long maxSizeInMegabytes = (long)0, bool requiresDuplicateDetection = false, System.TimeSpan defaultMessageTimeToLive = default(System.TimeSpan), System.TimeSpan autoDeleteOnIdle = default(System.TimeSpan), System.TimeSpan duplicateDetectionHistoryTimeWindow = default(System.TimeSpan), bool enableBatchedOperations = false, Azure.Messaging.ServiceBus.Administration.EntityStatus status = default(Azure.Messaging.ServiceBus.Administration.EntityStatus)) { throw null; }
+ public static Azure.Messaging.ServiceBus.Administration.TopicProperties TopicProperties(string name, long maxSizeInMegabytes = (long)0, bool requiresDuplicateDetection = false, System.TimeSpan defaultMessageTimeToLive = default(System.TimeSpan), System.TimeSpan autoDeleteOnIdle = default(System.TimeSpan), System.TimeSpan duplicateDetectionHistoryTimeWindow = default(System.TimeSpan), bool enableBatchedOperations = false, Azure.Messaging.ServiceBus.Administration.EntityStatus status = default(Azure.Messaging.ServiceBus.Administration.EntityStatus), bool enablePartitioning = false) { throw null; }
}
public partial class ServiceBusProcessor : System.IAsyncDisposable
{
@@ -260,7 +260,7 @@ internal ServiceBusReceivedMessage() { }
public string Subject { get { throw null; } }
public System.TimeSpan TimeToLive { get { throw null; } }
public string To { get { throw null; } }
- public Azure.Core.Amqp.AmqpAnnotatedMessage GetRawMessage() { throw null; }
+ public Azure.Core.Amqp.AmqpAnnotatedMessage GetRawAmqpMessage() { throw null; }
public override string ToString() { throw null; }
}
public enum ServiceBusReceiveMode
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueueProperties.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueueProperties.cs
index 705d43e310ef..b717284dbdc5 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueueProperties.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueueProperties.cs
@@ -51,6 +51,7 @@ internal QueueProperties(CreateQueueOptions options)
Status = options.Status;
ForwardTo = options.ForwardTo;
ForwardDeadLetteredMessagesTo = options.ForwardDeadLetteredMessagesTo;
+ EnablePartitioning = options.EnablePartitioning;
if (options.UserMetadata != null)
{
UserMetadata = options.UserMetadata;
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusMessage.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusMessage.cs
index cd15dd36df73..8a2f8f22528e 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusMessage.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusMessage.cs
@@ -405,7 +405,7 @@ public DateTimeOffset ScheduledEnqueueTime
/// data that is not exposed as top level properties in the .
///
/// The raw Amqp message.
- public AmqpAnnotatedMessage GetRawMessage() => AmqpMessage;
+ public AmqpAnnotatedMessage GetRawAmqpMessage() => AmqpMessage;
///
/// Gets the application properties bag, which can be used for custom message metadata.
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusModelFactory.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusModelFactory.cs
index b6bf93dcd493..f78b649c6391 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusModelFactory.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusModelFactory.cs
@@ -124,7 +124,8 @@ public static QueueProperties QueueProperties(
EntityStatus status = default,
string forwardTo = default,
string forwardDeadLetteredMessagesTo = default,
- string userMetadata = default) =>
+ string userMetadata = default,
+ bool enablePartitioning = default) =>
new QueueProperties(name)
{
LockDuration = lockDuration,
@@ -141,7 +142,8 @@ public static QueueProperties QueueProperties(
Status = status,
ForwardTo = forwardTo,
ForwardDeadLetteredMessagesTo = forwardDeadLetteredMessagesTo,
- UserMetadata = userMetadata
+ UserMetadata = userMetadata,
+ EnablePartitioning = enablePartitioning
};
///
@@ -156,7 +158,8 @@ public static TopicProperties TopicProperties(
TimeSpan autoDeleteOnIdle = default,
TimeSpan duplicateDetectionHistoryTimeWindow = default,
bool enableBatchedOperations = default,
- EntityStatus status = default) =>
+ EntityStatus status = default,
+ bool enablePartitioning = default) =>
new TopicProperties(name)
{
MaxSizeInMegabytes = maxSizeInMegabytes,
@@ -167,6 +170,7 @@ public static TopicProperties TopicProperties(
EnableBatchedOperations = enableBatchedOperations,
AuthorizationRules = new AuthorizationRules(), // this cannot be created by the user
Status = status,
+ EnablePartitioning = enablePartitioning
};
///
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusReceivedMessage.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusReceivedMessage.cs
index 1f68c5c3f2a0..59e684f268f1 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusReceivedMessage.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusReceivedMessage.cs
@@ -56,7 +56,7 @@ internal ServiceBusReceivedMessage(): this(body: default)
/// data that is not exposed as top level properties in the .
///
/// The raw Amqp message.
- public AmqpAnnotatedMessage GetRawMessage() => AmqpMessage;
+ public AmqpAnnotatedMessage GetRawAmqpMessage() => AmqpMessage;
///
/// Gets the body of the message.
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/QueuePropertiesTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/QueuePropertiesTests.cs
index ab02cbb90ff9..7dab9207a670 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/QueuePropertiesTests.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/QueuePropertiesTests.cs
@@ -114,7 +114,8 @@ public void CanCreateQueuePropertiesFromFactory()
EntityStatus.Active,
"forward",
"dlq",
- "metadata");
+ "metadata",
+ true);
Assert.AreEqual("queueName", properties.Name);
Assert.AreEqual(TimeSpan.FromSeconds(30), properties.LockDuration);
Assert.AreEqual(100, properties.MaxSizeInMegabytes);
@@ -130,6 +131,34 @@ public void CanCreateQueuePropertiesFromFactory()
Assert.AreEqual("forward", properties.ForwardTo);
Assert.AreEqual("dlq", properties.ForwardDeadLetteredMessagesTo);
Assert.AreEqual("metadata", properties.UserMetadata);
+ Assert.IsTrue(properties.EnablePartitioning);
+ }
+
+ [Test]
+ public void CanCreateQueuePropertiesFromOptions()
+ {
+ var options = new CreateQueueOptions("queue")
+ {
+ LockDuration = TimeSpan.FromSeconds(60),
+ MaxSizeInMegabytes = 1024,
+ RequiresDuplicateDetection = true,
+ RequiresSession = true,
+ DefaultMessageTimeToLive = TimeSpan.FromSeconds(120),
+ AutoDeleteOnIdle = TimeSpan.FromMinutes(10),
+ DeadLetteringOnMessageExpiration = true,
+ DuplicateDetectionHistoryTimeWindow = TimeSpan.FromSeconds(100),
+ MaxDeliveryCount = 5,
+ EnableBatchedOperations = true,
+ AuthorizationRules = { new SharedAccessAuthorizationRule("key", new AccessRights[] { AccessRights.Listen }) },
+ Status = EntityStatus.Disabled,
+ ForwardDeadLetteredMessagesTo = "dlqForward",
+ ForwardTo = "forward",
+ EnablePartitioning = true,
+ UserMetadata = "metadata"
+ };
+ var properties = new QueueProperties(options);
+
+ Assert.AreEqual(options, new CreateQueueOptions(properties));
}
}
}
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/RulePropertiesTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/RulePropertiesTests.cs
index 0dab7d93feef..56db9470e854 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/RulePropertiesTests.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/RulePropertiesTests.cs
@@ -21,5 +21,18 @@ public void CanCreateRulePropertiesFromFactory()
Assert.AreEqual(filter, properties.Filter);
Assert.AreEqual(action, properties.Action);
}
+
+ [Test]
+ public void CanCreateRulePropertiesFromOptions()
+ {
+ var options = new CreateRuleOptions("rule")
+ {
+ Filter = new SqlRuleFilter("PROPERTY(@propertyName) = @stringPropertyValue"),
+ Action = new SqlRuleAction("SET a='b'")
+ };
+ var properties = new RuleProperties(options);
+
+ Assert.AreEqual(options, new CreateRuleOptions(properties));
+ }
}
}
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/ServiceBusManagementClientLiveTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/ServiceBusManagementClientLiveTests.cs
index a23501d9f6fc..81758bc1c0ee 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/ServiceBusManagementClientLiveTests.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/ServiceBusManagementClientLiveTests.cs
@@ -19,7 +19,7 @@ namespace Azure.Messaging.ServiceBus.Tests.Management
public class ServiceBusManagementClientLiveTests : RecordedTestBase
{
public ServiceBusManagementClientLiveTests(bool isAsync) :
- base(isAsync: true)
+ base(isAsync: true, RecordedTestMode.Record)
{
Sanitizer = new ServiceBusRecordedTestSanitizer();
}
@@ -177,7 +177,7 @@ public async Task BasicTopicCrudOperations()
DuplicateDetectionHistoryTimeWindow = TimeSpan.FromMinutes(1),
EnableBatchedOperations = true,
EnablePartitioning = false,
- MaxSizeInMegabytes = 2048,
+ MaxSizeInMegabytes = 1024,
RequiresDuplicateDetection = true,
UserMetadata = nameof(BasicTopicCrudOperations)
};
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/SubscriptionPropertiesTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/SubscriptionPropertiesTests.cs
index dddaf8241529..ec4c19b31633 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/SubscriptionPropertiesTests.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/SubscriptionPropertiesTests.cs
@@ -93,5 +93,27 @@ public void CanCreateSubscriptionPropertiesFromFactory()
Assert.AreEqual("dlq", properties.ForwardDeadLetteredMessagesTo);
Assert.AreEqual("metadata", properties.UserMetadata);
}
+
+ [Test]
+ public void CanCreateSubscriptionPropertiesFromOptions()
+ {
+ var options = new CreateSubscriptionOptions("topic", "subscription")
+ {
+ LockDuration = TimeSpan.FromSeconds(60),
+ RequiresSession = true,
+ DefaultMessageTimeToLive = TimeSpan.FromSeconds(120),
+ AutoDeleteOnIdle = TimeSpan.FromMinutes(10),
+ DeadLetteringOnMessageExpiration = true,
+ MaxDeliveryCount = 5,
+ EnableBatchedOperations = true,
+ Status = EntityStatus.Disabled,
+ ForwardDeadLetteredMessagesTo = "dlqForward",
+ ForwardTo = "forward",
+ UserMetadata = "metadata"
+ };
+ var properties = new SubscriptionProperties(options);
+
+ Assert.AreEqual(options, new CreateSubscriptionOptions(properties));
+ }
}
}
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/TopicPropertiesTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/TopicPropertiesTests.cs
index 9f8821f01d94..800a93002014 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/TopicPropertiesTests.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/TopicPropertiesTests.cs
@@ -20,7 +20,8 @@ public void CanCreateTopicPropertiesFromFactory()
TimeSpan.FromMinutes(5),
TimeSpan.FromMinutes(10),
false,
- EntityStatus.Active);
+ EntityStatus.Active,
+ true);
Assert.AreEqual("topicName", properties.Name);
Assert.AreEqual(100, properties.MaxSizeInMegabytes);
Assert.IsTrue(properties.RequiresDuplicateDetection);
@@ -29,6 +30,28 @@ public void CanCreateTopicPropertiesFromFactory()
Assert.AreEqual(TimeSpan.FromMinutes(10), properties.DuplicateDetectionHistoryTimeWindow);
Assert.IsFalse(properties.EnableBatchedOperations);
Assert.AreEqual(EntityStatus.Active, properties.Status);
+ Assert.IsTrue(properties.EnablePartitioning);
+ }
+
+ [Test]
+ public void CanCreateTopicPropertiesFromOptions()
+ {
+ var options = new CreateTopicOptions("topic")
+ {
+ MaxSizeInMegabytes = 1024,
+ RequiresDuplicateDetection = true,
+ DefaultMessageTimeToLive = TimeSpan.FromSeconds(120),
+ AutoDeleteOnIdle = TimeSpan.FromMinutes(10),
+ DuplicateDetectionHistoryTimeWindow = TimeSpan.FromSeconds(100),
+ EnableBatchedOperations = true,
+ AuthorizationRules = { new SharedAccessAuthorizationRule("key", new AccessRights[] { AccessRights.Listen }) },
+ Status = EntityStatus.Disabled,
+ EnablePartitioning = true,
+ UserMetadata = "metadata"
+ };
+ var properties = new TopicProperties(options);
+
+ Assert.AreEqual(options, new CreateTopicOptions(properties));
}
}
}
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Message/MessageLiveTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Message/MessageLiveTests.cs
index 7d54ec15da1e..1b2dc9f56153 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Message/MessageLiveTests.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Message/MessageLiveTests.cs
@@ -131,7 +131,7 @@ public async Task CreateFromReceivedMessageCopiesProperties()
ServiceBusSessionReceiver receiver = await client.AcceptNextSessionAsync(scope.QueueName);
ServiceBusReceivedMessage received = await receiver.ReceiveMessageAsync();
- AmqpAnnotatedMessage rawReceived = received.GetRawMessage();
+ AmqpAnnotatedMessage rawReceived = received.GetRawAmqpMessage();
Assert.IsNotNull(rawReceived.Header.DeliveryCount);
Assert.IsTrue(rawReceived.MessageAnnotations.ContainsKey(AmqpMessageConstants.LockedUntilName));
Assert.IsTrue(rawReceived.MessageAnnotations.ContainsKey(AmqpMessageConstants.SequenceNumberName));
@@ -140,7 +140,7 @@ public async Task CreateFromReceivedMessageCopiesProperties()
AssertMessagesEqual(msg, received);
var toSend = new ServiceBusMessage(received);
- AmqpAnnotatedMessage rawSend = toSend.GetRawMessage();
+ AmqpAnnotatedMessage rawSend = toSend.GetRawAmqpMessage();
// verify that all system set properties have been cleared out
Assert.IsNull(rawSend.Header.DeliveryCount);
@@ -227,10 +227,10 @@ public async Task CanSendMultipleDataSections()
var receiver = client.CreateReceiver(scope.QueueName);
var received = await receiver.ReceiveMessageAsync();
- received.GetRawMessage().Body.TryGetData(out var receivedData);
+ received.GetRawAmqpMessage().Body.TryGetData(out var receivedData);
var bodyEnum = receivedData.GetEnumerator();
int ct = 0;
- msg.GetRawMessage().Body.TryGetData(out var sentData);
+ msg.GetRawAmqpMessage().Body.TryGetData(out var sentData);
foreach (ReadOnlyMemory data in sentData)
{
@@ -257,13 +257,13 @@ public async Task CanSetMessageId()
var client = new ServiceBusClient(TestEnvironment.ServiceBusConnectionString);
var sender = client.CreateSender(scope.QueueName);
var msg = new ServiceBusMessage();
- msg.GetRawMessage().Body = new AmqpMessageBody(new ReadOnlyMemory[]
+ msg.GetRawAmqpMessage().Body = new AmqpMessageBody(new ReadOnlyMemory[]
{
new ReadOnlyMemory(GetRandomBuffer(100)),
new ReadOnlyMemory(GetRandomBuffer(100))
});
Guid guid = Guid.NewGuid();
- msg.GetRawMessage().Properties.MessageId = new AmqpMessageId(guid.ToString());
+ msg.GetRawAmqpMessage().Properties.MessageId = new AmqpMessageId(guid.ToString());
await sender.SendMessageAsync(msg);
From 6e86d1c86ec50379ad241dfe62f017239b6e3bc9 Mon Sep 17 00:00:00 2001
From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Date: Thu, 19 Nov 2020 18:31:26 -0800
Subject: [PATCH 2/5] Revert test change
---
.../Administration/ServiceBusManagementClientLiveTests.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/ServiceBusManagementClientLiveTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/ServiceBusManagementClientLiveTests.cs
index 81758bc1c0ee..4f7bf93ca7d5 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/ServiceBusManagementClientLiveTests.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/ServiceBusManagementClientLiveTests.cs
@@ -19,7 +19,7 @@ namespace Azure.Messaging.ServiceBus.Tests.Management
public class ServiceBusManagementClientLiveTests : RecordedTestBase
{
public ServiceBusManagementClientLiveTests(bool isAsync) :
- base(isAsync: true, RecordedTestMode.Record)
+ base(isAsync: true)
{
Sanitizer = new ServiceBusRecordedTestSanitizer();
}
@@ -72,7 +72,7 @@ public async Task BasicQueueCrudOperations()
ForwardTo = null,
LockDuration = TimeSpan.FromSeconds(45),
MaxDeliveryCount = 8,
- MaxSizeInMegabytes = 2048,
+ MaxSizeInMegabytes = 1024,
RequiresDuplicateDetection = true,
RequiresSession = false,
UserMetadata = nameof(BasicQueueCrudOperations),
From f3b5fc82561d4b0a48867c595f87a0327d70f3d5 Mon Sep 17 00:00:00 2001
From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com>
Date: Thu, 19 Nov 2020 19:33:10 -0800
Subject: [PATCH 3/5] Port ATOM fix
---
.../src/Administration/QueueProperties.cs | 25 +-
.../QueuePropertiesExtensions.cs | 59 +++--
.../SubscriptionPropertiesExtensions.cs | 31 +--
.../src/Administration/TopicProperties.cs | 16 ++
.../TopicPropertiesExtensions.cs | 52 +++--
.../Administration/QueuePropertiesTests.cs | 58 +++++
.../ServiceBusManagementClientLiveTests.cs | 6 +-
.../SubscriptionPropertiesTests.cs | 50 ++++
.../AuthenticateWithAADAsync.json | 62 ++---
...henticateWithSharedKeyCredentialAsync.json | 62 ++---
.../BasicQueueCrudOperationsAsync.json | 167 +++++++++-----
.../BasicRuleCrudOperationsAsync.json | 216 +++++++++---------
.../BasicSubscriptionCrudOperationsAsync.json | 143 ++++++------
.../BasicTopicCrudOperationsAsync.json | 119 +++++-----
.../CorrelationFilterPropertiesAsync.json | 66 +++---
.../GetNamespacePropertiesAsync.json | 16 +-
.../GetTopicRuntimeInfoAsync.json | 107 ++++-----
.../SqlFilterParamsAsync.json | 62 ++---
.../ThrowsIfEntityAlreadyExistsAsync.json | 128 ++++++-----
.../ThrowsIfEntityDoesNotExistAsync.json | 208 +++++++++--------
20 files changed, 972 insertions(+), 681 deletions(-)
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueueProperties.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueueProperties.cs
index b717284dbdc5..b5401a5bea80 100644
--- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueueProperties.cs
+++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueueProperties.cs
@@ -3,6 +3,8 @@
using System;
using System.Collections.Generic;
+using System.Xml;
+using System.Xml.Linq;
using Azure.Core;
namespace Azure.Messaging.ServiceBus.Administration
@@ -287,11 +289,29 @@ public string UserMetadata
}
}
+ internal bool IsAnonymousAccessible { get; set; } = false;
+
+ internal bool SupportOrdering
+ {
+ get
+ {
+ return _internalSupportOrdering ?? !EnablePartitioning;
+ }
+ set
+ {
+ _internalSupportOrdering = value;
+ }
+ }
+
+ internal bool? _internalSupportOrdering = null;
+
+ internal bool EnableExpress { get; set; } = false;
+
///
/// List of properties that were retrieved using GetQueue but are not understood by this version of client is stored here.
/// The list will be sent back when an already retrieved QueueDescription will be used in UpdateQueue call.
///
- internal List