diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/CONTRIBUTING.md b/sdk/servicebus/Azure.Messaging.ServiceBus/CONTRIBUTING.md index 20715442fbea..1329475c354b 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/CONTRIBUTING.md +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/CONTRIBUTING.md @@ -50,7 +50,7 @@ The Live tests read information from the following environment variables: The connection string to an existing Service Bus namespace to use for testing. If specified, this namespace will be used as the basis for the test run, with queues, topics, and subscriptions dynamically managed by the tests. When the run is complete, the namespace will be left in the state that it was in before the test run took place. If not specified, a new namespace will be dynamically created for the test run and removed at the end of the run. - `AZURE_TEST_MODE` _**(optional)**_\ - This is used for the Service Bus management client tests, which use the HTTP recording framework. By default tests are run in playback mode. To change the mode this value may be set to one of the following values: `Live`, `Playback`, `Record`. + This is used for the Service Bus administration client tests, which use the HTTP recording framework. By default tests are run in playback mode. To change the mode this value may be set to one of the following values: `Live`, `Playback`, `Record`. - `AZURE_AUTHORITY_HOST` _**(optional)**_\ The name of the Azure Authority to use for authenticating resource management operations. The default for this is appropriate for use with the Azure public cloud; when testing in other cloud instances, this may be needed. 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 a03b11bd710d..1002f11ed6db 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 @@ -176,15 +176,15 @@ public void Dispose() { } public static partial class ServiceBusModelFactory { [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public static Azure.Messaging.ServiceBus.Management.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.Management.EntityStatus status = default(Azure.Messaging.ServiceBus.Management.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) { throw null; } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public static Azure.Messaging.ServiceBus.Management.RuleProperties RuleProperties(string name, Azure.Messaging.ServiceBus.Management.RuleFilter filter = null, Azure.Messaging.ServiceBus.Management.RuleAction action = null) { throw null; } + 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)] public static Azure.Messaging.ServiceBus.ServiceBusReceivedMessage ServiceBusReceivedMessage(Azure.BinaryData body = default(Azure.BinaryData), string messageId = null, string partitionKey = null, string viaPartitionKey = null, string sessionId = null, string replyToSessionId = null, System.TimeSpan timeToLive = default(System.TimeSpan), string correlationId = null, string subject = null, string to = null, string contentType = null, string replyTo = null, System.DateTimeOffset scheduledEnqueueTime = default(System.DateTimeOffset), System.Collections.Generic.IDictionary properties = null, System.Guid lockTokenGuid = default(System.Guid), int deliveryCount = 0, System.DateTimeOffset lockedUntil = default(System.DateTimeOffset), long sequenceNumber = (long)-1, string deadLetterSource = null, long enqueuedSequenceNumber = (long)0, System.DateTimeOffset enqueuedTime = default(System.DateTimeOffset)) { throw null; } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public static Azure.Messaging.ServiceBus.Management.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.Management.EntityStatus status = default(Azure.Messaging.ServiceBus.Management.EntityStatus), string forwardTo = null, string forwardDeadLetteredMessagesTo = null, string userMetadata = null) { throw null; } + 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.Management.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.Management.EntityStatus status = default(Azure.Messaging.ServiceBus.Management.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)) { throw null; } } public partial class ServiceBusProcessor : System.IAsyncDisposable { @@ -445,7 +445,7 @@ public enum SubQueue TransferDeadLetter = 2, } } -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { public enum AccessRights { @@ -453,28 +453,28 @@ public enum AccessRights Send = 1, Listen = 2, } - public abstract partial class AuthorizationRule : System.IEquatable + public abstract partial class AuthorizationRule : System.IEquatable { internal AuthorizationRule() { } public abstract string ClaimType { get; } public System.DateTimeOffset CreatedTime { get { throw null; } } public abstract string KeyName { get; set; } public System.DateTimeOffset ModifiedTime { get { throw null; } } - public abstract System.Collections.Generic.List Rights { get; set; } - public abstract bool Equals(Azure.Messaging.ServiceBus.Management.AuthorizationRule other); + public abstract System.Collections.Generic.List Rights { get; set; } + public abstract bool Equals(Azure.Messaging.ServiceBus.Administration.AuthorizationRule other); public abstract override bool Equals(object obj); public override int GetHashCode() { throw null; } } - public partial class AuthorizationRules : System.Collections.Generic.List, System.IEquatable + public partial class AuthorizationRules : System.Collections.Generic.List, System.IEquatable { internal AuthorizationRules() { } - public bool Equals(Azure.Messaging.ServiceBus.Management.AuthorizationRules other) { throw null; } + public bool Equals(Azure.Messaging.ServiceBus.Administration.AuthorizationRules other) { throw null; } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } - public static bool operator ==(Azure.Messaging.ServiceBus.Management.AuthorizationRules left, Azure.Messaging.ServiceBus.Management.AuthorizationRules right) { throw null; } - public static bool operator !=(Azure.Messaging.ServiceBus.Management.AuthorizationRules left, Azure.Messaging.ServiceBus.Management.AuthorizationRules right) { throw null; } + public static bool operator ==(Azure.Messaging.ServiceBus.Administration.AuthorizationRules left, Azure.Messaging.ServiceBus.Administration.AuthorizationRules right) { throw null; } + public static bool operator !=(Azure.Messaging.ServiceBus.Administration.AuthorizationRules left, Azure.Messaging.ServiceBus.Administration.AuthorizationRules right) { throw null; } } - public sealed partial class CorrelationRuleFilter : Azure.Messaging.ServiceBus.Management.RuleFilter + public sealed partial class CorrelationRuleFilter : Azure.Messaging.ServiceBus.Administration.RuleFilter { public CorrelationRuleFilter() { } public CorrelationRuleFilter(string correlationId) { } @@ -487,18 +487,18 @@ public CorrelationRuleFilter(string correlationId) { } public string SessionId { get { throw null; } set { } } public string Subject { get { throw null; } set { } } public string To { get { throw null; } set { } } - public override bool Equals(Azure.Messaging.ServiceBus.Management.RuleFilter other) { throw null; } + public override bool Equals(Azure.Messaging.ServiceBus.Administration.RuleFilter other) { throw null; } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } - public static bool operator ==(Azure.Messaging.ServiceBus.Management.CorrelationRuleFilter left, Azure.Messaging.ServiceBus.Management.CorrelationRuleFilter right) { throw null; } - public static bool operator !=(Azure.Messaging.ServiceBus.Management.CorrelationRuleFilter left, Azure.Messaging.ServiceBus.Management.CorrelationRuleFilter right) { throw null; } + public static bool operator ==(Azure.Messaging.ServiceBus.Administration.CorrelationRuleFilter left, Azure.Messaging.ServiceBus.Administration.CorrelationRuleFilter right) { throw null; } + public static bool operator !=(Azure.Messaging.ServiceBus.Administration.CorrelationRuleFilter left, Azure.Messaging.ServiceBus.Administration.CorrelationRuleFilter right) { throw null; } public override string ToString() { throw null; } } - public partial class CreateQueueOptions : System.IEquatable + public partial class CreateQueueOptions : System.IEquatable { - public CreateQueueOptions(Azure.Messaging.ServiceBus.Management.QueueProperties queue) { } + public CreateQueueOptions(Azure.Messaging.ServiceBus.Administration.QueueProperties queue) { } public CreateQueueOptions(string name) { } - public Azure.Messaging.ServiceBus.Management.AuthorizationRules AuthorizationRules { get { throw null; } } + public Azure.Messaging.ServiceBus.Administration.AuthorizationRules AuthorizationRules { get { throw null; } } public System.TimeSpan AutoDeleteOnIdle { get { throw null; } set { } } public bool DeadLetteringOnMessageExpiration { get { throw null; } set { } } public System.TimeSpan DefaultMessageTimeToLive { get { throw null; } set { } } @@ -513,33 +513,33 @@ public CreateQueueOptions(string name) { } public string Name { get { throw null; } set { } } public bool RequiresDuplicateDetection { get { throw null; } set { } } public bool RequiresSession { get { throw null; } set { } } - public Azure.Messaging.ServiceBus.Management.EntityStatus Status { get { throw null; } set { } } + public Azure.Messaging.ServiceBus.Administration.EntityStatus Status { get { throw null; } set { } } public string UserMetadata { get { throw null; } set { } } - public bool Equals(Azure.Messaging.ServiceBus.Management.CreateQueueOptions other) { throw null; } + public bool Equals(Azure.Messaging.ServiceBus.Administration.CreateQueueOptions other) { throw null; } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } - public static bool operator ==(Azure.Messaging.ServiceBus.Management.CreateQueueOptions left, Azure.Messaging.ServiceBus.Management.CreateQueueOptions right) { throw null; } - public static bool operator !=(Azure.Messaging.ServiceBus.Management.CreateQueueOptions left, Azure.Messaging.ServiceBus.Management.CreateQueueOptions right) { throw null; } + public static bool operator ==(Azure.Messaging.ServiceBus.Administration.CreateQueueOptions left, Azure.Messaging.ServiceBus.Administration.CreateQueueOptions right) { throw null; } + public static bool operator !=(Azure.Messaging.ServiceBus.Administration.CreateQueueOptions left, Azure.Messaging.ServiceBus.Administration.CreateQueueOptions right) { throw null; } } - public sealed partial class CreateRuleOptions : System.IEquatable + public sealed partial class CreateRuleOptions : System.IEquatable { public const string DefaultRuleName = "$Default"; public CreateRuleOptions() { } - public CreateRuleOptions(Azure.Messaging.ServiceBus.Management.RuleProperties rule) { } + public CreateRuleOptions(Azure.Messaging.ServiceBus.Administration.RuleProperties rule) { } public CreateRuleOptions(string name) { } - public CreateRuleOptions(string name, Azure.Messaging.ServiceBus.Management.RuleFilter filter) { } - public Azure.Messaging.ServiceBus.Management.RuleAction Action { get { throw null; } set { } } - public Azure.Messaging.ServiceBus.Management.RuleFilter Filter { get { throw null; } set { } } + public CreateRuleOptions(string name, Azure.Messaging.ServiceBus.Administration.RuleFilter filter) { } + public Azure.Messaging.ServiceBus.Administration.RuleAction Action { get { throw null; } set { } } + public Azure.Messaging.ServiceBus.Administration.RuleFilter Filter { get { throw null; } set { } } public string Name { get { throw null; } set { } } - public bool Equals(Azure.Messaging.ServiceBus.Management.CreateRuleOptions other) { throw null; } + public bool Equals(Azure.Messaging.ServiceBus.Administration.CreateRuleOptions other) { throw null; } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } - public static bool operator ==(Azure.Messaging.ServiceBus.Management.CreateRuleOptions left, Azure.Messaging.ServiceBus.Management.CreateRuleOptions right) { throw null; } - public static bool operator !=(Azure.Messaging.ServiceBus.Management.CreateRuleOptions left, Azure.Messaging.ServiceBus.Management.CreateRuleOptions right) { throw null; } + public static bool operator ==(Azure.Messaging.ServiceBus.Administration.CreateRuleOptions left, Azure.Messaging.ServiceBus.Administration.CreateRuleOptions right) { throw null; } + public static bool operator !=(Azure.Messaging.ServiceBus.Administration.CreateRuleOptions left, Azure.Messaging.ServiceBus.Administration.CreateRuleOptions right) { throw null; } } - public partial class CreateSubscriptionOptions : System.IEquatable + public partial class CreateSubscriptionOptions : System.IEquatable { - public CreateSubscriptionOptions(Azure.Messaging.ServiceBus.Management.SubscriptionProperties subscription) { } + public CreateSubscriptionOptions(Azure.Messaging.ServiceBus.Administration.SubscriptionProperties subscription) { } public CreateSubscriptionOptions(string topicName, string subscriptionName) { } public System.TimeSpan AutoDeleteOnIdle { get { throw null; } set { } } public bool DeadLetteringOnMessageExpiration { get { throw null; } set { } } @@ -551,21 +551,21 @@ public CreateSubscriptionOptions(string topicName, string subscriptionName) { } public System.TimeSpan LockDuration { get { throw null; } set { } } public int MaxDeliveryCount { get { throw null; } set { } } public bool RequiresSession { get { throw null; } set { } } - public Azure.Messaging.ServiceBus.Management.EntityStatus Status { get { throw null; } set { } } + public Azure.Messaging.ServiceBus.Administration.EntityStatus Status { get { throw null; } set { } } public string SubscriptionName { get { throw null; } set { } } public string TopicName { get { throw null; } set { } } public string UserMetadata { get { throw null; } set { } } - public bool Equals(Azure.Messaging.ServiceBus.Management.CreateSubscriptionOptions other) { throw null; } + public bool Equals(Azure.Messaging.ServiceBus.Administration.CreateSubscriptionOptions other) { throw null; } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } - public static bool operator ==(Azure.Messaging.ServiceBus.Management.CreateSubscriptionOptions left, Azure.Messaging.ServiceBus.Management.CreateSubscriptionOptions right) { throw null; } - public static bool operator !=(Azure.Messaging.ServiceBus.Management.CreateSubscriptionOptions left, Azure.Messaging.ServiceBus.Management.CreateSubscriptionOptions right) { throw null; } + public static bool operator ==(Azure.Messaging.ServiceBus.Administration.CreateSubscriptionOptions left, Azure.Messaging.ServiceBus.Administration.CreateSubscriptionOptions right) { throw null; } + public static bool operator !=(Azure.Messaging.ServiceBus.Administration.CreateSubscriptionOptions left, Azure.Messaging.ServiceBus.Administration.CreateSubscriptionOptions right) { throw null; } } - public partial class CreateTopicOptions : System.IEquatable + public partial class CreateTopicOptions : System.IEquatable { - public CreateTopicOptions(Azure.Messaging.ServiceBus.Management.TopicProperties topic) { } + public CreateTopicOptions(Azure.Messaging.ServiceBus.Administration.TopicProperties topic) { } public CreateTopicOptions(string name) { } - public Azure.Messaging.ServiceBus.Management.AuthorizationRules AuthorizationRules { get { throw null; } } + public Azure.Messaging.ServiceBus.Administration.AuthorizationRules AuthorizationRules { get { throw null; } } public System.TimeSpan AutoDeleteOnIdle { get { throw null; } set { } } public System.TimeSpan DefaultMessageTimeToLive { get { throw null; } set { } } public System.TimeSpan DuplicateDetectionHistoryTimeWindow { get { throw null; } set { } } @@ -574,62 +574,62 @@ public CreateTopicOptions(string name) { } public long MaxSizeInMegabytes { get { throw null; } set { } } public string Name { get { throw null; } set { } } public bool RequiresDuplicateDetection { get { throw null; } set { } } - public Azure.Messaging.ServiceBus.Management.EntityStatus Status { get { throw null; } set { } } + public Azure.Messaging.ServiceBus.Administration.EntityStatus Status { get { throw null; } set { } } public bool SupportOrdering { get { throw null; } set { } } public string UserMetadata { get { throw null; } set { } } - public bool Equals(Azure.Messaging.ServiceBus.Management.CreateTopicOptions other) { throw null; } + public bool Equals(Azure.Messaging.ServiceBus.Administration.CreateTopicOptions other) { throw null; } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } - public static bool operator ==(Azure.Messaging.ServiceBus.Management.CreateTopicOptions left, Azure.Messaging.ServiceBus.Management.CreateTopicOptions right) { throw null; } - public static bool operator !=(Azure.Messaging.ServiceBus.Management.CreateTopicOptions left, Azure.Messaging.ServiceBus.Management.CreateTopicOptions right) { throw null; } + public static bool operator ==(Azure.Messaging.ServiceBus.Administration.CreateTopicOptions left, Azure.Messaging.ServiceBus.Administration.CreateTopicOptions right) { throw null; } + public static bool operator !=(Azure.Messaging.ServiceBus.Administration.CreateTopicOptions left, Azure.Messaging.ServiceBus.Administration.CreateTopicOptions right) { throw null; } } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct EntityStatus : System.IEquatable + public readonly partial struct EntityStatus : System.IEquatable { private readonly object _dummy; private readonly int _dummyPrimitive; public EntityStatus(string value) { throw null; } - public static Azure.Messaging.ServiceBus.Management.EntityStatus Active { get { throw null; } } - public static Azure.Messaging.ServiceBus.Management.EntityStatus Disabled { get { throw null; } } - public static Azure.Messaging.ServiceBus.Management.EntityStatus ReceiveDisabled { get { throw null; } } - public static Azure.Messaging.ServiceBus.Management.EntityStatus SendDisabled { get { throw null; } } - public bool Equals(Azure.Messaging.ServiceBus.Management.EntityStatus other) { throw null; } + public static Azure.Messaging.ServiceBus.Administration.EntityStatus Active { get { throw null; } } + public static Azure.Messaging.ServiceBus.Administration.EntityStatus Disabled { get { throw null; } } + public static Azure.Messaging.ServiceBus.Administration.EntityStatus ReceiveDisabled { get { throw null; } } + public static Azure.Messaging.ServiceBus.Administration.EntityStatus SendDisabled { get { throw null; } } + public bool Equals(Azure.Messaging.ServiceBus.Administration.EntityStatus other) { throw null; } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public override bool Equals(object obj) { throw null; } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public override int GetHashCode() { throw null; } - public static bool operator ==(Azure.Messaging.ServiceBus.Management.EntityStatus left, Azure.Messaging.ServiceBus.Management.EntityStatus right) { throw null; } - public static implicit operator Azure.Messaging.ServiceBus.Management.EntityStatus (string value) { throw null; } - public static bool operator !=(Azure.Messaging.ServiceBus.Management.EntityStatus left, Azure.Messaging.ServiceBus.Management.EntityStatus right) { throw null; } + public static bool operator ==(Azure.Messaging.ServiceBus.Administration.EntityStatus left, Azure.Messaging.ServiceBus.Administration.EntityStatus right) { throw null; } + public static implicit operator Azure.Messaging.ServiceBus.Administration.EntityStatus (string value) { throw null; } + public static bool operator !=(Azure.Messaging.ServiceBus.Administration.EntityStatus left, Azure.Messaging.ServiceBus.Administration.EntityStatus right) { throw null; } public override string ToString() { throw null; } } - public sealed partial class FalseRuleFilter : Azure.Messaging.ServiceBus.Management.SqlRuleFilter + public sealed partial class FalseRuleFilter : Azure.Messaging.ServiceBus.Administration.SqlRuleFilter { public FalseRuleFilter() : base (default(string)) { } - public override bool Equals(Azure.Messaging.ServiceBus.Management.RuleFilter other) { throw null; } + public override bool Equals(Azure.Messaging.ServiceBus.Administration.RuleFilter other) { throw null; } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } - public static bool operator ==(Azure.Messaging.ServiceBus.Management.FalseRuleFilter left, Azure.Messaging.ServiceBus.Management.FalseRuleFilter right) { throw null; } - public static bool operator !=(Azure.Messaging.ServiceBus.Management.FalseRuleFilter left, Azure.Messaging.ServiceBus.Management.FalseRuleFilter right) { throw null; } + public static bool operator ==(Azure.Messaging.ServiceBus.Administration.FalseRuleFilter left, Azure.Messaging.ServiceBus.Administration.FalseRuleFilter right) { throw null; } + public static bool operator !=(Azure.Messaging.ServiceBus.Administration.FalseRuleFilter left, Azure.Messaging.ServiceBus.Administration.FalseRuleFilter right) { throw null; } public override string ToString() { throw null; } } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct MessagingSku : System.IEquatable + public readonly partial struct MessagingSku : System.IEquatable { private readonly object _dummy; private readonly int _dummyPrimitive; public MessagingSku(string value) { throw null; } - public static Azure.Messaging.ServiceBus.Management.MessagingSku Basic { get { throw null; } } - public static Azure.Messaging.ServiceBus.Management.MessagingSku Premium { get { throw null; } } - public static Azure.Messaging.ServiceBus.Management.MessagingSku Standard { get { throw null; } } - public bool Equals(Azure.Messaging.ServiceBus.Management.MessagingSku other) { throw null; } + public static Azure.Messaging.ServiceBus.Administration.MessagingSku Basic { get { throw null; } } + public static Azure.Messaging.ServiceBus.Administration.MessagingSku Premium { get { throw null; } } + public static Azure.Messaging.ServiceBus.Administration.MessagingSku Standard { get { throw null; } } + public bool Equals(Azure.Messaging.ServiceBus.Administration.MessagingSku other) { throw null; } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public override bool Equals(object obj) { throw null; } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public override int GetHashCode() { throw null; } - public static bool operator ==(Azure.Messaging.ServiceBus.Management.MessagingSku left, Azure.Messaging.ServiceBus.Management.MessagingSku right) { throw null; } - public static implicit operator Azure.Messaging.ServiceBus.Management.MessagingSku (string value) { throw null; } - public static bool operator !=(Azure.Messaging.ServiceBus.Management.MessagingSku left, Azure.Messaging.ServiceBus.Management.MessagingSku right) { throw null; } + public static bool operator ==(Azure.Messaging.ServiceBus.Administration.MessagingSku left, Azure.Messaging.ServiceBus.Administration.MessagingSku right) { throw null; } + public static implicit operator Azure.Messaging.ServiceBus.Administration.MessagingSku (string value) { throw null; } + public static bool operator !=(Azure.Messaging.ServiceBus.Administration.MessagingSku left, Azure.Messaging.ServiceBus.Administration.MessagingSku right) { throw null; } public override string ToString() { throw null; } } public partial class NamespaceProperties @@ -637,15 +637,15 @@ public partial class NamespaceProperties public NamespaceProperties() { } public string Alias { get { throw null; } } public System.DateTimeOffset CreatedTime { get { throw null; } } - public Azure.Messaging.ServiceBus.Management.MessagingSku MessagingSku { get { throw null; } } + public Azure.Messaging.ServiceBus.Administration.MessagingSku MessagingSku { get { throw null; } } public int MessagingUnits { get { throw null; } } public System.DateTimeOffset ModifiedTime { get { throw null; } } public string Name { get { throw null; } } } - public partial class QueueProperties : System.IEquatable + public partial class QueueProperties : System.IEquatable { internal QueueProperties() { } - public Azure.Messaging.ServiceBus.Management.AuthorizationRules AuthorizationRules { get { throw null; } } + public Azure.Messaging.ServiceBus.Administration.AuthorizationRules AuthorizationRules { get { throw null; } } public System.TimeSpan AutoDeleteOnIdle { get { throw null; } set { } } public bool DeadLetteringOnMessageExpiration { get { throw null; } set { } } public System.TimeSpan DefaultMessageTimeToLive { get { throw null; } set { } } @@ -660,13 +660,13 @@ internal QueueProperties() { } public string Name { get { throw null; } } public bool RequiresDuplicateDetection { get { throw null; } } public bool RequiresSession { get { throw null; } } - public Azure.Messaging.ServiceBus.Management.EntityStatus Status { get { throw null; } set { } } + public Azure.Messaging.ServiceBus.Administration.EntityStatus Status { get { throw null; } set { } } public string UserMetadata { get { throw null; } set { } } - public bool Equals(Azure.Messaging.ServiceBus.Management.QueueProperties other) { throw null; } + public bool Equals(Azure.Messaging.ServiceBus.Administration.QueueProperties other) { throw null; } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } - public static bool operator ==(Azure.Messaging.ServiceBus.Management.QueueProperties left, Azure.Messaging.ServiceBus.Management.QueueProperties right) { throw null; } - public static bool operator !=(Azure.Messaging.ServiceBus.Management.QueueProperties left, Azure.Messaging.ServiceBus.Management.QueueProperties right) { throw null; } + public static bool operator ==(Azure.Messaging.ServiceBus.Administration.QueueProperties left, Azure.Messaging.ServiceBus.Administration.QueueProperties right) { throw null; } + public static bool operator !=(Azure.Messaging.ServiceBus.Administration.QueueProperties left, Azure.Messaging.ServiceBus.Administration.QueueProperties right) { throw null; } } public partial class QueueRuntimeProperties { @@ -683,80 +683,80 @@ internal QueueRuntimeProperties() { } public long TransferMessageCount { get { throw null; } } public System.DateTimeOffset UpdatedAt { get { throw null; } } } - public abstract partial class RuleAction : System.IEquatable + public abstract partial class RuleAction : System.IEquatable { internal RuleAction() { } - public abstract bool Equals(Azure.Messaging.ServiceBus.Management.RuleAction other); + public abstract bool Equals(Azure.Messaging.ServiceBus.Administration.RuleAction other); public abstract override bool Equals(object obj); public override int GetHashCode() { throw null; } } - public abstract partial class RuleFilter : System.IEquatable + public abstract partial class RuleFilter : System.IEquatable { internal RuleFilter() { } - public abstract bool Equals(Azure.Messaging.ServiceBus.Management.RuleFilter other); + public abstract bool Equals(Azure.Messaging.ServiceBus.Administration.RuleFilter other); public abstract override bool Equals(object obj); public override int GetHashCode() { throw null; } } - public sealed partial class RuleProperties : System.IEquatable + public sealed partial class RuleProperties : System.IEquatable { internal RuleProperties() { } public const string DefaultRuleName = "$Default"; - public Azure.Messaging.ServiceBus.Management.RuleAction Action { get { throw null; } set { } } - public Azure.Messaging.ServiceBus.Management.RuleFilter Filter { get { throw null; } set { } } + public Azure.Messaging.ServiceBus.Administration.RuleAction Action { get { throw null; } set { } } + public Azure.Messaging.ServiceBus.Administration.RuleFilter Filter { get { throw null; } set { } } public string Name { get { throw null; } } - public bool Equals(Azure.Messaging.ServiceBus.Management.RuleProperties other) { throw null; } + public bool Equals(Azure.Messaging.ServiceBus.Administration.RuleProperties other) { throw null; } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } - public static bool operator ==(Azure.Messaging.ServiceBus.Management.RuleProperties left, Azure.Messaging.ServiceBus.Management.RuleProperties right) { throw null; } - public static bool operator !=(Azure.Messaging.ServiceBus.Management.RuleProperties left, Azure.Messaging.ServiceBus.Management.RuleProperties right) { throw null; } - } - public partial class ServiceBusManagementClient - { - protected ServiceBusManagementClient() { } - public ServiceBusManagementClient(string connectionString) { } - public ServiceBusManagementClient(string fullyQualifiedNamespace, Azure.Core.TokenCredential credential) { } - public ServiceBusManagementClient(string fullyQualifiedNamespace, Azure.Core.TokenCredential credential, Azure.Messaging.ServiceBus.Management.ServiceBusManagementClientOptions options) { } - public ServiceBusManagementClient(string connectionString, Azure.Messaging.ServiceBus.Management.ServiceBusManagementClientOptions options) { } - public virtual System.Threading.Tasks.Task> CreateQueueAsync(Azure.Messaging.ServiceBus.Management.CreateQueueOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> CreateQueueAsync(string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> CreateRuleAsync(string topicName, string subscriptionName, Azure.Messaging.ServiceBus.Management.CreateRuleOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> CreateSubscriptionAsync(Azure.Messaging.ServiceBus.Management.CreateSubscriptionOptions options, Azure.Messaging.ServiceBus.Management.CreateRuleOptions rule, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> CreateSubscriptionAsync(Azure.Messaging.ServiceBus.Management.CreateSubscriptionOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> CreateSubscriptionAsync(string topicName, string subscriptionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> CreateTopicAsync(Azure.Messaging.ServiceBus.Management.CreateTopicOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> CreateTopicAsync(string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public static bool operator ==(Azure.Messaging.ServiceBus.Administration.RuleProperties left, Azure.Messaging.ServiceBus.Administration.RuleProperties right) { throw null; } + public static bool operator !=(Azure.Messaging.ServiceBus.Administration.RuleProperties left, Azure.Messaging.ServiceBus.Administration.RuleProperties right) { throw null; } + } + public partial class ServiceBusAdministrationClient + { + protected ServiceBusAdministrationClient() { } + public ServiceBusAdministrationClient(string connectionString) { } + public ServiceBusAdministrationClient(string fullyQualifiedNamespace, Azure.Core.TokenCredential credential) { } + public ServiceBusAdministrationClient(string fullyQualifiedNamespace, Azure.Core.TokenCredential credential, Azure.Messaging.ServiceBus.Administration.ServiceBusAdministrationClientOptions options) { } + public ServiceBusAdministrationClient(string connectionString, Azure.Messaging.ServiceBus.Administration.ServiceBusAdministrationClientOptions options) { } + public virtual System.Threading.Tasks.Task> CreateQueueAsync(Azure.Messaging.ServiceBus.Administration.CreateQueueOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> CreateQueueAsync(string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> CreateRuleAsync(string topicName, string subscriptionName, Azure.Messaging.ServiceBus.Administration.CreateRuleOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> CreateSubscriptionAsync(Azure.Messaging.ServiceBus.Administration.CreateSubscriptionOptions options, Azure.Messaging.ServiceBus.Administration.CreateRuleOptions rule, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> CreateSubscriptionAsync(Azure.Messaging.ServiceBus.Administration.CreateSubscriptionOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> CreateSubscriptionAsync(string topicName, string subscriptionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> CreateTopicAsync(Azure.Messaging.ServiceBus.Administration.CreateTopicOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> CreateTopicAsync(string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual System.Threading.Tasks.Task DeleteQueueAsync(string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual System.Threading.Tasks.Task DeleteRuleAsync(string topicName, string subscriptionName, string ruleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual System.Threading.Tasks.Task DeleteSubscriptionAsync(string topicName, string subscriptionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual System.Threading.Tasks.Task DeleteTopicAsync(string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> GetNamespacePropertiesAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> GetQueueAsync(string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> GetQueueRuntimePropertiesAsync(string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual Azure.AsyncPageable GetQueuesAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual Azure.AsyncPageable GetQueuesRuntimePropertiesAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> GetRuleAsync(string topicName, string subscriptionName, string ruleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual Azure.AsyncPageable GetRulesAsync(string topicName, string subscriptionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> GetSubscriptionAsync(string topicName, string subscriptionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> GetSubscriptionRuntimePropertiesAsync(string topicName, string subscriptionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual Azure.AsyncPageable GetSubscriptionsAsync(string topicName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual Azure.AsyncPageable GetSubscriptionsRuntimePropertiesAsync(string topicName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> GetTopicAsync(string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> GetTopicRuntimePropertiesAsync(string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual Azure.AsyncPageable GetTopicsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual Azure.AsyncPageable GetTopicsRuntimePropertiesAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> GetNamespacePropertiesAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> GetQueueAsync(string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> GetQueueRuntimePropertiesAsync(string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual Azure.AsyncPageable GetQueuesAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual Azure.AsyncPageable GetQueuesRuntimePropertiesAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> GetRuleAsync(string topicName, string subscriptionName, string ruleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual Azure.AsyncPageable GetRulesAsync(string topicName, string subscriptionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> GetSubscriptionAsync(string topicName, string subscriptionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> GetSubscriptionRuntimePropertiesAsync(string topicName, string subscriptionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual Azure.AsyncPageable GetSubscriptionsAsync(string topicName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual Azure.AsyncPageable GetSubscriptionsRuntimePropertiesAsync(string topicName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> GetTopicAsync(string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> GetTopicRuntimePropertiesAsync(string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual Azure.AsyncPageable GetTopicsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual Azure.AsyncPageable GetTopicsRuntimePropertiesAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual System.Threading.Tasks.Task> QueueExistsAsync(string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual System.Threading.Tasks.Task> RuleExistsAsync(string topicName, string subscriptionName, string ruleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual System.Threading.Tasks.Task> SubscriptionExistsAsync(string topicName, string subscriptionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual System.Threading.Tasks.Task> TopicExistsAsync(string name, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> UpdateQueueAsync(Azure.Messaging.ServiceBus.Management.QueueProperties queue, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> UpdateRuleAsync(string topicName, string subscriptionName, Azure.Messaging.ServiceBus.Management.RuleProperties rule, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> UpdateSubscriptionAsync(Azure.Messaging.ServiceBus.Management.SubscriptionProperties subscription, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task> UpdateTopicAsync(Azure.Messaging.ServiceBus.Management.TopicProperties topic, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> UpdateQueueAsync(Azure.Messaging.ServiceBus.Administration.QueueProperties queue, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> UpdateRuleAsync(string topicName, string subscriptionName, Azure.Messaging.ServiceBus.Administration.RuleProperties rule, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> UpdateSubscriptionAsync(Azure.Messaging.ServiceBus.Administration.SubscriptionProperties subscription, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task> UpdateTopicAsync(Azure.Messaging.ServiceBus.Administration.TopicProperties topic, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } } - public partial class ServiceBusManagementClientOptions : Azure.Core.ClientOptions + public partial class ServiceBusAdministrationClientOptions : Azure.Core.ClientOptions { - public ServiceBusManagementClientOptions(Azure.Messaging.ServiceBus.Management.ServiceBusManagementClientOptions.ServiceVersion version = Azure.Messaging.ServiceBus.Management.ServiceBusManagementClientOptions.ServiceVersion.V2017_04) { } - public Azure.Messaging.ServiceBus.Management.ServiceBusManagementClientOptions.ServiceVersion Version { get { throw null; } } + public ServiceBusAdministrationClientOptions(Azure.Messaging.ServiceBus.Administration.ServiceBusAdministrationClientOptions.ServiceVersion version = Azure.Messaging.ServiceBus.Administration.ServiceBusAdministrationClientOptions.ServiceVersion.V2017_04) { } + public Azure.Messaging.ServiceBus.Administration.ServiceBusAdministrationClientOptions.ServiceVersion Version { get { throw null; } } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] public override bool Equals(object obj) { throw null; } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] @@ -768,47 +768,47 @@ public enum ServiceVersion V2017_04 = 1, } } - public partial class SharedAccessAuthorizationRule : Azure.Messaging.ServiceBus.Management.AuthorizationRule + public partial class SharedAccessAuthorizationRule : Azure.Messaging.ServiceBus.Administration.AuthorizationRule { - public SharedAccessAuthorizationRule(string keyName, System.Collections.Generic.IEnumerable rights) { } - public SharedAccessAuthorizationRule(string keyName, string primaryKey, System.Collections.Generic.IEnumerable rights) { } - public SharedAccessAuthorizationRule(string keyName, string primaryKey, string secondaryKey, System.Collections.Generic.IEnumerable rights) { } + public SharedAccessAuthorizationRule(string keyName, System.Collections.Generic.IEnumerable rights) { } + public SharedAccessAuthorizationRule(string keyName, string primaryKey, System.Collections.Generic.IEnumerable rights) { } + public SharedAccessAuthorizationRule(string keyName, string primaryKey, string secondaryKey, System.Collections.Generic.IEnumerable rights) { } public override string ClaimType { get { throw null; } } public sealed override string KeyName { get { throw null; } set { } } public string PrimaryKey { get { throw null; } set { } } - public override System.Collections.Generic.List Rights { get { throw null; } set { } } + public override System.Collections.Generic.List Rights { get { throw null; } set { } } public string SecondaryKey { get { throw null; } set { } } - public override bool Equals(Azure.Messaging.ServiceBus.Management.AuthorizationRule other) { throw null; } + public override bool Equals(Azure.Messaging.ServiceBus.Administration.AuthorizationRule other) { throw null; } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } - public static bool operator ==(Azure.Messaging.ServiceBus.Management.SharedAccessAuthorizationRule left, Azure.Messaging.ServiceBus.Management.SharedAccessAuthorizationRule right) { throw null; } - public static bool operator !=(Azure.Messaging.ServiceBus.Management.SharedAccessAuthorizationRule left, Azure.Messaging.ServiceBus.Management.SharedAccessAuthorizationRule right) { throw null; } + public static bool operator ==(Azure.Messaging.ServiceBus.Administration.SharedAccessAuthorizationRule left, Azure.Messaging.ServiceBus.Administration.SharedAccessAuthorizationRule right) { throw null; } + public static bool operator !=(Azure.Messaging.ServiceBus.Administration.SharedAccessAuthorizationRule left, Azure.Messaging.ServiceBus.Administration.SharedAccessAuthorizationRule right) { throw null; } } - public sealed partial class SqlRuleAction : Azure.Messaging.ServiceBus.Management.RuleAction + public sealed partial class SqlRuleAction : Azure.Messaging.ServiceBus.Administration.RuleAction { public SqlRuleAction(string sqlExpression) { } public System.Collections.Generic.IDictionary Parameters { get { throw null; } set { } } public string SqlExpression { get { throw null; } } - public override bool Equals(Azure.Messaging.ServiceBus.Management.RuleAction other) { throw null; } + public override bool Equals(Azure.Messaging.ServiceBus.Administration.RuleAction other) { throw null; } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } - public static bool operator ==(Azure.Messaging.ServiceBus.Management.SqlRuleAction left, Azure.Messaging.ServiceBus.Management.SqlRuleAction right) { throw null; } - public static bool operator !=(Azure.Messaging.ServiceBus.Management.SqlRuleAction left, Azure.Messaging.ServiceBus.Management.SqlRuleAction right) { throw null; } + public static bool operator ==(Azure.Messaging.ServiceBus.Administration.SqlRuleAction left, Azure.Messaging.ServiceBus.Administration.SqlRuleAction right) { throw null; } + public static bool operator !=(Azure.Messaging.ServiceBus.Administration.SqlRuleAction left, Azure.Messaging.ServiceBus.Administration.SqlRuleAction right) { throw null; } public override string ToString() { throw null; } } - public partial class SqlRuleFilter : Azure.Messaging.ServiceBus.Management.RuleFilter + public partial class SqlRuleFilter : Azure.Messaging.ServiceBus.Administration.RuleFilter { public SqlRuleFilter(string sqlExpression) { } public System.Collections.Generic.IDictionary Parameters { get { throw null; } } public string SqlExpression { get { throw null; } } - public override bool Equals(Azure.Messaging.ServiceBus.Management.RuleFilter other) { throw null; } + public override bool Equals(Azure.Messaging.ServiceBus.Administration.RuleFilter other) { throw null; } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } - public static bool operator ==(Azure.Messaging.ServiceBus.Management.SqlRuleFilter left, Azure.Messaging.ServiceBus.Management.SqlRuleFilter right) { throw null; } - public static bool operator !=(Azure.Messaging.ServiceBus.Management.SqlRuleFilter left, Azure.Messaging.ServiceBus.Management.SqlRuleFilter right) { throw null; } + public static bool operator ==(Azure.Messaging.ServiceBus.Administration.SqlRuleFilter left, Azure.Messaging.ServiceBus.Administration.SqlRuleFilter right) { throw null; } + public static bool operator !=(Azure.Messaging.ServiceBus.Administration.SqlRuleFilter left, Azure.Messaging.ServiceBus.Administration.SqlRuleFilter right) { throw null; } public override string ToString() { throw null; } } - public partial class SubscriptionProperties : System.IEquatable + public partial class SubscriptionProperties : System.IEquatable { internal SubscriptionProperties() { } public System.TimeSpan AutoDeleteOnIdle { get { throw null; } set { } } @@ -821,15 +821,15 @@ internal SubscriptionProperties() { } public System.TimeSpan LockDuration { get { throw null; } set { } } public int MaxDeliveryCount { get { throw null; } set { } } public bool RequiresSession { get { throw null; } set { } } - public Azure.Messaging.ServiceBus.Management.EntityStatus Status { get { throw null; } set { } } + public Azure.Messaging.ServiceBus.Administration.EntityStatus Status { get { throw null; } set { } } public string SubscriptionName { get { throw null; } set { } } public string TopicName { get { throw null; } set { } } public string UserMetadata { get { throw null; } set { } } - public bool Equals(Azure.Messaging.ServiceBus.Management.SubscriptionProperties other) { throw null; } + public bool Equals(Azure.Messaging.ServiceBus.Administration.SubscriptionProperties other) { throw null; } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } - public static bool operator ==(Azure.Messaging.ServiceBus.Management.SubscriptionProperties left, Azure.Messaging.ServiceBus.Management.SubscriptionProperties right) { throw null; } - public static bool operator !=(Azure.Messaging.ServiceBus.Management.SubscriptionProperties left, Azure.Messaging.ServiceBus.Management.SubscriptionProperties right) { throw null; } + public static bool operator ==(Azure.Messaging.ServiceBus.Administration.SubscriptionProperties left, Azure.Messaging.ServiceBus.Administration.SubscriptionProperties right) { throw null; } + public static bool operator !=(Azure.Messaging.ServiceBus.Administration.SubscriptionProperties left, Azure.Messaging.ServiceBus.Administration.SubscriptionProperties right) { throw null; } } public partial class SubscriptionRuntimeProperties { @@ -845,10 +845,10 @@ internal SubscriptionRuntimeProperties() { } public long TransferMessageCount { get { throw null; } } public System.DateTimeOffset UpdatedAt { get { throw null; } } } - public partial class TopicProperties : System.IEquatable + public partial class TopicProperties : System.IEquatable { internal TopicProperties() { } - public Azure.Messaging.ServiceBus.Management.AuthorizationRules AuthorizationRules { get { throw null; } } + public Azure.Messaging.ServiceBus.Administration.AuthorizationRules AuthorizationRules { get { throw null; } } public System.TimeSpan AutoDeleteOnIdle { get { throw null; } set { } } public System.TimeSpan DefaultMessageTimeToLive { get { throw null; } set { } } public System.TimeSpan DuplicateDetectionHistoryTimeWindow { get { throw null; } set { } } @@ -857,14 +857,14 @@ internal TopicProperties() { } public long MaxSizeInMegabytes { get { throw null; } set { } } public string Name { get { throw null; } set { } } public bool RequiresDuplicateDetection { get { throw null; } set { } } - public Azure.Messaging.ServiceBus.Management.EntityStatus Status { get { throw null; } set { } } + public Azure.Messaging.ServiceBus.Administration.EntityStatus Status { get { throw null; } set { } } public bool SupportOrdering { get { throw null; } set { } } public string UserMetadata { get { throw null; } set { } } - public bool Equals(Azure.Messaging.ServiceBus.Management.TopicProperties other) { throw null; } + public bool Equals(Azure.Messaging.ServiceBus.Administration.TopicProperties other) { throw null; } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } - public static bool operator ==(Azure.Messaging.ServiceBus.Management.TopicProperties left, Azure.Messaging.ServiceBus.Management.TopicProperties right) { throw null; } - public static bool operator !=(Azure.Messaging.ServiceBus.Management.TopicProperties left, Azure.Messaging.ServiceBus.Management.TopicProperties right) { throw null; } + public static bool operator ==(Azure.Messaging.ServiceBus.Administration.TopicProperties left, Azure.Messaging.ServiceBus.Administration.TopicProperties right) { throw null; } + public static bool operator !=(Azure.Messaging.ServiceBus.Administration.TopicProperties left, Azure.Messaging.ServiceBus.Administration.TopicProperties right) { throw null; } } public partial class TopicRuntimeProperties { @@ -877,14 +877,14 @@ internal TopicRuntimeProperties() { } public int SubscriptionCount { get { throw null; } } public System.DateTimeOffset UpdatedAt { get { throw null; } } } - public sealed partial class TrueRuleFilter : Azure.Messaging.ServiceBus.Management.SqlRuleFilter + public sealed partial class TrueRuleFilter : Azure.Messaging.ServiceBus.Administration.SqlRuleFilter { public TrueRuleFilter() : base (default(string)) { } - public override bool Equals(Azure.Messaging.ServiceBus.Management.RuleFilter other) { throw null; } + public override bool Equals(Azure.Messaging.ServiceBus.Administration.RuleFilter other) { throw null; } public override bool Equals(object obj) { throw null; } public override int GetHashCode() { throw null; } - public static bool operator ==(Azure.Messaging.ServiceBus.Management.TrueRuleFilter left, Azure.Messaging.ServiceBus.Management.TrueRuleFilter right) { throw null; } - public static bool operator !=(Azure.Messaging.ServiceBus.Management.TrueRuleFilter left, Azure.Messaging.ServiceBus.Management.TrueRuleFilter right) { throw null; } + public static bool operator ==(Azure.Messaging.ServiceBus.Administration.TrueRuleFilter left, Azure.Messaging.ServiceBus.Administration.TrueRuleFilter right) { throw null; } + public static bool operator !=(Azure.Messaging.ServiceBus.Administration.TrueRuleFilter left, Azure.Messaging.ServiceBus.Administration.TrueRuleFilter right) { throw null; } public override string ToString() { throw null; } } } diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/samples/Sample07_CrudOperations.md b/sdk/servicebus/Azure.Messaging.ServiceBus/samples/Sample07_CrudOperations.md index 87313260f534..0d657b45b563 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/samples/Sample07_CrudOperations.md +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/samples/Sample07_CrudOperations.md @@ -7,7 +7,7 @@ This sample demonstrates how to use the management client to manage entities wit ```C# Snippet:CreateQueue string connectionString = ""; string queueName = ""; -var client = new ServiceBusManagementClient(connectionString); +var client = new ServiceBusAdministrationClient(connectionString); var options = new CreateQueueOptions(queueName) { AutoDeleteOnIdle = TimeSpan.FromDays(7), diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/AccessRights.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/AccessRights.cs similarity index 92% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/AccessRights.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/AccessRights.cs index 47e458c0b4b0..72d381d5a60b 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/AccessRights.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/AccessRights.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/ManagementClientConstants.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/AdministrationClientConstants.cs similarity index 98% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/ManagementClientConstants.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/AdministrationClientConstants.cs index 3ea1c68b0ea9..8c9bd3847242 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/ManagementClientConstants.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/AdministrationClientConstants.cs @@ -4,9 +4,9 @@ using System; using System.Globalization; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { - internal class ManagementClientConstants + internal class AdministrationClientConstants { public const int QueueNameMaximumLength = 260; public const int TopicNameMaximumLength = 260; diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/AuthorizationRule.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/AuthorizationRule.cs similarity index 95% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/AuthorizationRule.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/AuthorizationRule.cs index d327e4a6dcf3..fdcaa88f2054 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/AuthorizationRule.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/AuthorizationRule.cs @@ -6,7 +6,7 @@ using System.Data; using System.Xml.Linq; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Specifies the authorization rule. @@ -49,7 +49,7 @@ internal AuthorizationRule() internal static AuthorizationRule ParseFromXElement(XElement xElement) { - XAttribute attribute = xElement.Attribute(XName.Get("type", ManagementClientConstants.XmlSchemaInstanceNamespace)); + XAttribute attribute = xElement.Attribute(XName.Get("type", AdministrationClientConstants.XmlSchemaInstanceNamespace)); if (attribute == null) { return null; diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/AuthorizationRules.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/AuthorizationRules.cs similarity index 93% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/AuthorizationRules.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/AuthorizationRules.cs index 6c8346ae6a2f..e6f7838bd8c0 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/AuthorizationRules.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/AuthorizationRules.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Xml.Linq; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Specifies the authorization rules. @@ -16,7 +16,7 @@ public class AuthorizationRules : List, IEquatable rule.Serialize())); return rules; @@ -37,7 +37,7 @@ internal AuthorizationRules() { } internal static AuthorizationRules ParseFromXElement(XElement xElement) { var rules = new AuthorizationRules(); - var xRules = xElement.Elements(XName.Get("AuthorizationRule", ManagementClientConstants.ServiceBusNamespace)); + var xRules = xElement.Elements(XName.Get("AuthorizationRule", AdministrationClientConstants.ServiceBusNamespace)); rules.AddRange(xRules.Select(rule => AuthorizationRule.ParseFromXElement(rule))); return rules; } diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/ClientDiagnostics.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/ClientDiagnostics.cs similarity index 100% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/ClientDiagnostics.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/ClientDiagnostics.cs diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/CreateQueueOptions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/CreateQueueOptions.cs similarity index 95% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/CreateQueueOptions.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/CreateQueueOptions.cs index 558fc60ac09d..e2a01075515f 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/CreateQueueOptions.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/CreateQueueOptions.cs @@ -4,7 +4,7 @@ using System; using Azure.Core; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Represents the set of options that can be specified for the creation of a queue. @@ -130,8 +130,8 @@ public TimeSpan DefaultMessageTimeToLive { Argument.AssertInRange( value, - ManagementClientConstants.MinimumAllowedTimeToLive, - ManagementClientConstants.MaximumAllowedTimeToLive, + AdministrationClientConstants.MinimumAllowedTimeToLive, + AdministrationClientConstants.MaximumAllowedTimeToLive, nameof(DefaultMessageTimeToLive)); _defaultMessageTimeToLive = value; @@ -149,7 +149,7 @@ public TimeSpan AutoDeleteOnIdle { Argument.AssertAtLeast( value, - ManagementClientConstants.MinimumAllowedAutoDeleteOnIdle, + AdministrationClientConstants.MinimumAllowedAutoDeleteOnIdle, nameof(AutoDeleteOnIdle)); autoDeleteOnIdle = value; @@ -175,8 +175,8 @@ public TimeSpan DuplicateDetectionHistoryTimeWindow { Argument.AssertInRange( value, - ManagementClientConstants.MinimumDuplicateDetectionHistoryTimeWindow, - ManagementClientConstants.MaximumDuplicateDetectionHistoryTimeWindow, + AdministrationClientConstants.MinimumDuplicateDetectionHistoryTimeWindow, + AdministrationClientConstants.MaximumDuplicateDetectionHistoryTimeWindow, nameof(DuplicateDetectionHistoryTimeWindow)); _duplicateDetectionHistoryTimeWindow = value; @@ -196,7 +196,7 @@ public int MaxDeliveryCount { Argument.AssertAtLeast( value, - ManagementClientConstants.MinAllowedMaxDeliveryCount, + AdministrationClientConstants.MinAllowedMaxDeliveryCount, nameof(MaxDeliveryCount)); _maxDeliveryCount = value; @@ -291,7 +291,7 @@ public string UserMetadata Argument.AssertNotNull(value, nameof(UserMetadata)); Argument.AssertNotTooLong( value, - ManagementClientConstants.MaxUserMetadataLength, + AdministrationClientConstants.MaxUserMetadataLength, nameof(UserMetadata)); _userMetadata = value; diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/CreateSubscriptionOptions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/CreateSubscriptionOptions.cs similarity index 97% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/CreateSubscriptionOptions.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/CreateSubscriptionOptions.cs index e62840c47bdf..9d8bd8b3038b 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/CreateSubscriptionOptions.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/CreateSubscriptionOptions.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using Azure.Core; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Represents the metadata description of the subscription. @@ -100,8 +100,8 @@ public TimeSpan DefaultMessageTimeToLive { Argument.AssertInRange( value, - ManagementClientConstants.MinimumAllowedTimeToLive, - ManagementClientConstants.MaximumAllowedTimeToLive, + AdministrationClientConstants.MinimumAllowedTimeToLive, + AdministrationClientConstants.MaximumAllowedTimeToLive, nameof(DefaultMessageTimeToLive)); _defaultMessageTimeToLive = value; @@ -119,7 +119,7 @@ public TimeSpan AutoDeleteOnIdle { Argument.AssertAtLeast( value, - ManagementClientConstants.MinimumAllowedAutoDeleteOnIdle, + AdministrationClientConstants.MinimumAllowedAutoDeleteOnIdle, nameof(AutoDeleteOnIdle)); _autoDeleteOnIdle = value; @@ -181,7 +181,7 @@ public int MaxDeliveryCount { Argument.AssertAtLeast( value, - ManagementClientConstants.MinAllowedMaxDeliveryCount, + AdministrationClientConstants.MinAllowedMaxDeliveryCount, nameof(AutoDeleteOnIdle)); _maxDeliveryCount = value; @@ -264,7 +264,7 @@ public string UserMetadata Argument.AssertNotNull(value, nameof(UserMetadata)); Argument.AssertNotTooLong( value, - ManagementClientConstants.MaxUserMetadataLength, + AdministrationClientConstants.MaxUserMetadataLength, nameof(UserMetadata)); _userMetadata = value; diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/CreateTopicOptions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/CreateTopicOptions.cs similarity index 94% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/CreateTopicOptions.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/CreateTopicOptions.cs index f5217b17e85b..381ac1ebaf0b 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/CreateTopicOptions.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/CreateTopicOptions.cs @@ -4,7 +4,7 @@ using System; using Azure.Core; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Represents the options that can be specified for the creation of a topic. @@ -67,8 +67,8 @@ public TimeSpan DefaultMessageTimeToLive { Argument.AssertInRange( value, - ManagementClientConstants.MinimumAllowedTimeToLive, - ManagementClientConstants.MaximumAllowedTimeToLive, + AdministrationClientConstants.MinimumAllowedTimeToLive, + AdministrationClientConstants.MaximumAllowedTimeToLive, nameof(DefaultMessageTimeToLive)); _defaultMessageTimeToLive = value; @@ -86,7 +86,7 @@ public TimeSpan AutoDeleteOnIdle { Argument.AssertAtLeast( value, - ManagementClientConstants.MinimumAllowedAutoDeleteOnIdle, + AdministrationClientConstants.MinimumAllowedAutoDeleteOnIdle, nameof(AutoDeleteOnIdle)); _autoDeleteOnIdle = value; @@ -120,8 +120,8 @@ public TimeSpan DuplicateDetectionHistoryTimeWindow { Argument.AssertInRange( value, - ManagementClientConstants.MinimumDuplicateDetectionHistoryTimeWindow, - ManagementClientConstants.MaximumDuplicateDetectionHistoryTimeWindow, + AdministrationClientConstants.MinimumDuplicateDetectionHistoryTimeWindow, + AdministrationClientConstants.MaximumDuplicateDetectionHistoryTimeWindow, nameof(DuplicateDetectionHistoryTimeWindow)); _duplicateDetectionHistoryTimeWindow = value; @@ -185,7 +185,7 @@ public string UserMetadata Argument.AssertNotNull(value, nameof(UserMetadata)); Argument.AssertNotTooLong( value, - ManagementClientConstants.MaxUserMetadataLength, + AdministrationClientConstants.MaxUserMetadataLength, nameof(UserMetadata)); _userMetadata = value; diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/EntityStatus.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/EntityStatus.cs similarity index 98% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/EntityStatus.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/EntityStatus.cs index 3af8aa860c49..5d88a0f570e0 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/EntityStatus.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/EntityStatus.cs @@ -4,7 +4,7 @@ using System; using System.ComponentModel; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// The status of the messaging entity. diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/HttpRequestAndResponse.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/HttpRequestAndResponse.cs similarity index 95% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/HttpRequestAndResponse.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/HttpRequestAndResponse.cs index 3a596861f942..fffad0f4e8ba 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/HttpRequestAndResponse.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/HttpRequestAndResponse.cs @@ -14,7 +14,7 @@ using System.Collections.Generic; using System.Globalization; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { internal class HttpRequestAndResponse { @@ -33,7 +33,7 @@ public HttpRequestAndResponse( ClientDiagnostics diagnostics, TokenCredential tokenCredential, string fullyQualifiedNamespace, - ServiceBusManagementClientOptions.ServiceVersion version) + ServiceBusAdministrationClientOptions.ServiceVersion version) { _pipeline = pipeline; _diagnostics = diagnostics; @@ -91,7 +91,7 @@ internal async Task ThrowIfRequestFailedAsync(Request request, Response response if (response.Status == (int)HttpStatusCode.Forbidden) { - if (ex.Message.Contains(ManagementClientConstants.ForbiddenInvalidOperationSubCode)) + if (ex.Message.Contains(AdministrationClientConstants.ForbiddenInvalidOperationSubCode)) { throw new InvalidOperationException(ex.Message, ex); } @@ -214,7 +214,7 @@ public async Task PutEntityAsync( request.Method = RequestMethod.Put; request.Uri = requestUriBuilder; request.Content = RequestContent.Create(Encoding.UTF8.GetBytes(requestBody)); - request.Headers.Add("Content-Type", ManagementClientConstants.AtomContentType); + request.Headers.Add("Content-Type", AdministrationClientConstants.AtomContentType); if (isUpdate) { @@ -226,7 +226,7 @@ public async Task PutEntityAsync( { var token = await GetTokenAsync(forwardTo).ConfigureAwait(false); request.Headers.Add( - ManagementClientConstants.ServiceBusSupplementartyAuthorizationHeaderName, + AdministrationClientConstants.ServiceBusSupplementartyAuthorizationHeaderName, credential.IsSharedAccessSignatureCredential == true ? token : $"Bearer { token }"); } @@ -234,7 +234,7 @@ public async Task PutEntityAsync( { var token = await GetTokenAsync(fwdDeadLetterTo).ConfigureAwait(false); request.Headers.Add( - ManagementClientConstants.ServiceBusDlqSupplementaryAuthorizationHeaderName, + AdministrationClientConstants.ServiceBusDlqSupplementaryAuthorizationHeaderName, credential.IsSharedAccessSignatureCredential == true ? token : $"Bearer { token }"); } diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/MessagingSku.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/MessagingSku.cs similarity index 98% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/MessagingSku.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/MessagingSku.cs index 04218d0aeba7..ec3b7a148f22 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/MessagingSku.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/MessagingSku.cs @@ -4,7 +4,7 @@ using System; using System.ComponentModel; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Specifies the SKU/tier of the messaging namespace. diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/NamespaceProperties.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/NamespaceProperties.cs similarity index 96% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/NamespaceProperties.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/NamespaceProperties.cs index 6f3af7b183c8..a48cf0a6b0e4 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/NamespaceProperties.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/NamespaceProperties.cs @@ -3,7 +3,7 @@ using System; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Represents the properties related to a Service Bus namespace. diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/NamespacePropertiesExtensions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/NamespacePropertiesExtensions.cs similarity index 92% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/NamespacePropertiesExtensions.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/NamespacePropertiesExtensions.cs index abb58fce9e02..f6b869fdd22f 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/NamespacePropertiesExtensions.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/NamespacePropertiesExtensions.cs @@ -5,7 +5,7 @@ using System.Globalization; using System.Xml.Linq; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { internal class NamespacePropertiesExtensions { @@ -34,8 +34,8 @@ private static NamespaceProperties ParseFromEntryElement(XElement xEntry) { var nsInfo = new NamespaceProperties(); - var nsInfoXml = xEntry.Element(XName.Get("content", ManagementClientConstants.AtomNamespace))? - .Element(XName.Get("NamespaceInfo", ManagementClientConstants.ServiceBusNamespace)); + var nsInfoXml = xEntry.Element(XName.Get("content", AdministrationClientConstants.AtomNamespace))? + .Element(XName.Get("NamespaceInfo", AdministrationClientConstants.ServiceBusNamespace)); if (nsInfoXml == null) { diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/NamespaceType.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/NamespaceType.cs similarity index 98% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/NamespaceType.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/NamespaceType.cs index 3d1cdbe0a358..d98c74b60ecd 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/NamespaceType.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/NamespaceType.cs @@ -4,7 +4,7 @@ using System; using System.ComponentModel; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Specifies the type of entities the namespace can contain. diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/QueueProperties.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueueProperties.cs similarity index 95% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/QueueProperties.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueueProperties.cs index 85817b5e1a68..25aa55fe985f 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/QueueProperties.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueueProperties.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using Azure.Core; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Represents the static properties of the queue. @@ -118,8 +118,8 @@ public TimeSpan DefaultMessageTimeToLive { Argument.AssertInRange( value, - ManagementClientConstants.MinimumAllowedTimeToLive, - ManagementClientConstants.MaximumAllowedTimeToLive, + AdministrationClientConstants.MinimumAllowedTimeToLive, + AdministrationClientConstants.MaximumAllowedTimeToLive, nameof(DefaultMessageTimeToLive)); _defaultMessageTimeToLive = value; @@ -137,7 +137,7 @@ public TimeSpan AutoDeleteOnIdle { Argument.AssertAtLeast( value, - ManagementClientConstants.MinimumAllowedAutoDeleteOnIdle, + AdministrationClientConstants.MinimumAllowedAutoDeleteOnIdle, nameof(AutoDeleteOnIdle)); _autoDeleteOnIdle = value; @@ -163,8 +163,8 @@ public TimeSpan DuplicateDetectionHistoryTimeWindow { Argument.AssertInRange( value, - ManagementClientConstants.MinimumDuplicateDetectionHistoryTimeWindow, - ManagementClientConstants.MaximumDuplicateDetectionHistoryTimeWindow, + AdministrationClientConstants.MinimumDuplicateDetectionHistoryTimeWindow, + AdministrationClientConstants.MaximumDuplicateDetectionHistoryTimeWindow, nameof(DuplicateDetectionHistoryTimeWindow)); _duplicateDetectionHistoryTimeWindow = value; @@ -184,7 +184,7 @@ public int MaxDeliveryCount { Argument.AssertAtLeast( value, - ManagementClientConstants.MinAllowedMaxDeliveryCount, + AdministrationClientConstants.MinAllowedMaxDeliveryCount, nameof(MaxDeliveryCount)); _maxDeliveryCount = value; @@ -279,7 +279,7 @@ public string UserMetadata Argument.AssertNotNull(value, nameof(UserMetadata)); Argument.AssertNotTooLong( value, - ManagementClientConstants.MaxUserMetadataLength, + AdministrationClientConstants.MaxUserMetadataLength, nameof(UserMetadata)); _userMetadata = value; diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/QueuePropertiesExtensions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueuePropertiesExtensions.cs similarity index 75% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/QueuePropertiesExtensions.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueuePropertiesExtensions.cs index 3ebee77b1705..2bbf8b006ab9 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/QueuePropertiesExtensions.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueuePropertiesExtensions.cs @@ -7,7 +7,7 @@ using System.Xml; using System.Globalization; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { internal static class QueuePropertiesExtensions { @@ -15,24 +15,24 @@ public static XDocument Serialize(this QueueProperties description) { var queueDescriptionElements = new List() { - new XElement(XName.Get("LockDuration", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.LockDuration)), - new XElement(XName.Get("MaxSizeInMegabytes", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.MaxSizeInMegabytes)), - new XElement(XName.Get("RequiresDuplicateDetection", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.RequiresDuplicateDetection)), - new XElement(XName.Get("RequiresSession", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.RequiresSession)), - description.DefaultMessageTimeToLive != TimeSpan.MaxValue ? new XElement(XName.Get("DefaultMessageTimeToLive", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.DefaultMessageTimeToLive)) : null, - new XElement(XName.Get("DeadLetteringOnMessageExpiration", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.DeadLetteringOnMessageExpiration)), + new XElement(XName.Get("LockDuration", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.LockDuration)), + new XElement(XName.Get("MaxSizeInMegabytes", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.MaxSizeInMegabytes)), + new XElement(XName.Get("RequiresDuplicateDetection", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.RequiresDuplicateDetection)), + new XElement(XName.Get("RequiresSession", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.RequiresSession)), + description.DefaultMessageTimeToLive != TimeSpan.MaxValue ? new XElement(XName.Get("DefaultMessageTimeToLive", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.DefaultMessageTimeToLive)) : null, + new XElement(XName.Get("DeadLetteringOnMessageExpiration", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.DeadLetteringOnMessageExpiration)), description.RequiresDuplicateDetection && description.DuplicateDetectionHistoryTimeWindow != default ? - new XElement(XName.Get("DuplicateDetectionHistoryTimeWindow", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.DuplicateDetectionHistoryTimeWindow)) + new XElement(XName.Get("DuplicateDetectionHistoryTimeWindow", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.DuplicateDetectionHistoryTimeWindow)) : null, - new XElement(XName.Get("MaxDeliveryCount", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.MaxDeliveryCount)), - new XElement(XName.Get("EnableBatchedOperations", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.EnableBatchedOperations)), + new XElement(XName.Get("MaxDeliveryCount", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.MaxDeliveryCount)), + new XElement(XName.Get("EnableBatchedOperations", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.EnableBatchedOperations)), description.AuthorizationRules?.Serialize(), - new XElement(XName.Get("Status", ManagementClientConstants.ServiceBusNamespace), description.Status.ToString()), - description.ForwardTo != null ? new XElement(XName.Get("ForwardTo", ManagementClientConstants.ServiceBusNamespace), description.ForwardTo) : null, - description.UserMetadata != null ? new XElement(XName.Get("UserMetadata", ManagementClientConstants.ServiceBusNamespace), description.UserMetadata) : null, - description.AutoDeleteOnIdle != TimeSpan.MaxValue ? new XElement(XName.Get("AutoDeleteOnIdle", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.AutoDeleteOnIdle)) : null, - new XElement(XName.Get("EnablePartitioning", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.EnablePartitioning)), - description.ForwardDeadLetteredMessagesTo != null ? new XElement(XName.Get("ForwardDeadLetteredMessagesTo", ManagementClientConstants.ServiceBusNamespace), description.ForwardDeadLetteredMessagesTo) : null + new XElement(XName.Get("Status", AdministrationClientConstants.ServiceBusNamespace), description.Status.ToString()), + description.ForwardTo != null ? new XElement(XName.Get("ForwardTo", AdministrationClientConstants.ServiceBusNamespace), description.ForwardTo) : null, + description.UserMetadata != null ? new XElement(XName.Get("UserMetadata", AdministrationClientConstants.ServiceBusNamespace), description.UserMetadata) : null, + description.AutoDeleteOnIdle != TimeSpan.MaxValue ? new XElement(XName.Get("AutoDeleteOnIdle", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.AutoDeleteOnIdle)) : null, + new XElement(XName.Get("EnablePartitioning", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.EnablePartitioning)), + description.ForwardDeadLetteredMessagesTo != null ? new XElement(XName.Get("ForwardDeadLetteredMessagesTo", AdministrationClientConstants.ServiceBusNamespace), description.ForwardDeadLetteredMessagesTo) : null }; if (description.UnknownProperties != null) @@ -41,10 +41,10 @@ public static XDocument Serialize(this QueueProperties description) } return new XDocument( - new XElement(XName.Get("entry", ManagementClientConstants.AtomNamespace), - new XElement(XName.Get("content", ManagementClientConstants.AtomNamespace), + new XElement(XName.Get("entry", AdministrationClientConstants.AtomNamespace), + new XElement(XName.Get("content", AdministrationClientConstants.AtomNamespace), new XAttribute("type", "application/xml"), - new XElement(XName.Get("QueueDescription", ManagementClientConstants.ServiceBusNamespace), + new XElement(XName.Get("QueueDescription", AdministrationClientConstants.ServiceBusNamespace), queueDescriptionElements.ToArray())))); } @@ -74,11 +74,11 @@ public static QueueProperties ParseFromContent(string xml) private static QueueProperties ParseFromEntryElement(XElement xEntry) { - var name = xEntry.Element(XName.Get("title", ManagementClientConstants.AtomNamespace)).Value; + var name = xEntry.Element(XName.Get("title", AdministrationClientConstants.AtomNamespace)).Value; var properties = new QueueProperties(name); - var qdXml = xEntry.Element(XName.Get("content", ManagementClientConstants.AtomNamespace))? - .Element(XName.Get("QueueDescription", ManagementClientConstants.ServiceBusNamespace)); + var qdXml = xEntry.Element(XName.Get("content", AdministrationClientConstants.AtomNamespace))? + .Element(XName.Get("QueueDescription", AdministrationClientConstants.ServiceBusNamespace)); if (qdXml == null) { @@ -178,7 +178,7 @@ public static List ParseCollectionFromContent(string xml) { var queueList = new List(); - var entryList = xDoc.Elements(XName.Get("entry", ManagementClientConstants.AtomNamespace)); + var entryList = xDoc.Elements(XName.Get("entry", AdministrationClientConstants.AtomNamespace)); foreach (var entry in entryList) { queueList.Add(ParseFromEntryElement(entry)); diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/QueueRuntimeProperties.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueueRuntimeProperties.cs similarity index 97% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/QueueRuntimeProperties.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueueRuntimeProperties.cs index 7574ab82da4f..b53ee5e8059a 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/QueueRuntimeProperties.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueueRuntimeProperties.cs @@ -3,7 +3,7 @@ using System; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Represents the runtime properties of the queue. diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/QueueRuntimePropertiesExtensions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueueRuntimePropertiesExtensions.cs similarity index 91% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/QueueRuntimePropertiesExtensions.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueueRuntimePropertiesExtensions.cs index 7063d2ee5870..c13b67672e68 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/QueueRuntimePropertiesExtensions.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/QueueRuntimePropertiesExtensions.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Globalization; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { internal static class QueueRuntimePropertiesExtensions { @@ -33,11 +33,11 @@ public static QueueRuntimeProperties ParseFromContent(string xml) private static QueueRuntimeProperties ParseFromEntryElement(XElement xEntry) { - var name = xEntry.Element(XName.Get("title", ManagementClientConstants.AtomNamespace)).Value; + var name = xEntry.Element(XName.Get("title", AdministrationClientConstants.AtomNamespace)).Value; var qRuntime = new QueueRuntimeProperties(name); - var qdXml = xEntry.Element(XName.Get("content", ManagementClientConstants.AtomNamespace))? - .Element(XName.Get("QueueDescription", ManagementClientConstants.ServiceBusNamespace)); + var qdXml = xEntry.Element(XName.Get("content", AdministrationClientConstants.AtomNamespace))? + .Element(XName.Get("QueueDescription", AdministrationClientConstants.ServiceBusNamespace)); if (qdXml == null) { @@ -103,7 +103,7 @@ public static List ParseCollectionFromContent(string xml { var queueList = new List(); - var entryList = xDoc.Elements(XName.Get("entry", ManagementClientConstants.AtomNamespace)); + var entryList = xDoc.Elements(XName.Get("entry", AdministrationClientConstants.AtomNamespace)); foreach (var entry in entryList) { queueList.Add(ParseFromEntryElement(entry)); diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/CorrelationRuleFilter.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/CorrelationRuleFilter.cs similarity index 99% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/CorrelationRuleFilter.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/CorrelationRuleFilter.cs index ace6fc77d18a..9d4e81f75b38 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/CorrelationRuleFilter.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/CorrelationRuleFilter.cs @@ -8,7 +8,7 @@ using Azure.Core; using Azure.Messaging.ServiceBus.Primitives; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Represents the correlation rule filter expression. diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/CorrelationRuleFilterExtensions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/CorrelationRuleFilterExtensions.cs similarity index 67% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/CorrelationRuleFilterExtensions.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/CorrelationRuleFilterExtensions.cs index 35d3fe86e559..4f685746f72d 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/CorrelationRuleFilterExtensions.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/CorrelationRuleFilterExtensions.cs @@ -5,7 +5,7 @@ using System.Xml.Linq; using Azure.Messaging.ServiceBus.Diagnostics; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { internal static class CorrelationRuleFilterExtensions { @@ -41,10 +41,10 @@ public static RuleFilter ParseFromXElement(XElement xElement) correlationRuleFilter.ContentType = element.Value; break; case "Properties": - foreach (var prop in element.Elements(XName.Get("KeyValueOfstringanyType", ManagementClientConstants.ServiceBusNamespace))) + foreach (var prop in element.Elements(XName.Get("KeyValueOfstringanyType", AdministrationClientConstants.ServiceBusNamespace))) { - var key = prop.Element(XName.Get("Key", ManagementClientConstants.ServiceBusNamespace))?.Value; - var value = XmlObjectConvertor.ParseValueObject(prop.Element(XName.Get("Value", ManagementClientConstants.ServiceBusNamespace))); + var key = prop.Element(XName.Get("Key", AdministrationClientConstants.ServiceBusNamespace))?.Value; + var value = XmlObjectConvertor.ParseValueObject(prop.Element(XName.Get("Value", AdministrationClientConstants.ServiceBusNamespace))); correlationRuleFilter.Properties.Add(key, value); } break; @@ -64,35 +64,35 @@ public static XElement Serialize(this CorrelationRuleFilter filter, string filte XElement parameterElement = new XElement( XName.Get( "Properties", - ManagementClientConstants.ServiceBusNamespace)); + AdministrationClientConstants.ServiceBusNamespace)); foreach (KeyValuePair param in filter.Properties) { parameterElement.Add( - new XElement(XName.Get("KeyValueOfstringanyType", ManagementClientConstants.ServiceBusNamespace), - new XElement(XName.Get("Key", ManagementClientConstants.ServiceBusNamespace), param.Key), + new XElement(XName.Get("KeyValueOfstringanyType", AdministrationClientConstants.ServiceBusNamespace), + new XElement(XName.Get("Key", AdministrationClientConstants.ServiceBusNamespace), param.Key), XmlObjectConvertor.SerializeObject(param.Value))); } return new XElement( - XName.Get("Filter", ManagementClientConstants.ServiceBusNamespace), - new XAttribute(XName.Get("type", ManagementClientConstants.XmlSchemaInstanceNamespace), filterName), + XName.Get("Filter", AdministrationClientConstants.ServiceBusNamespace), + new XAttribute(XName.Get("type", AdministrationClientConstants.XmlSchemaInstanceNamespace), filterName), string.IsNullOrWhiteSpace(filter.CorrelationId) ? null : - new XElement(XName.Get("CorrelationId", ManagementClientConstants.ServiceBusNamespace), filter.CorrelationId), + new XElement(XName.Get("CorrelationId", AdministrationClientConstants.ServiceBusNamespace), filter.CorrelationId), string.IsNullOrWhiteSpace(filter.MessageId) ? null : - new XElement(XName.Get("MessageId", ManagementClientConstants.ServiceBusNamespace), filter.MessageId), + new XElement(XName.Get("MessageId", AdministrationClientConstants.ServiceBusNamespace), filter.MessageId), string.IsNullOrWhiteSpace(filter.To) ? null : - new XElement(XName.Get("To", ManagementClientConstants.ServiceBusNamespace), filter.To), + new XElement(XName.Get("To", AdministrationClientConstants.ServiceBusNamespace), filter.To), string.IsNullOrWhiteSpace(filter.ReplyTo) ? null : - new XElement(XName.Get("ReplyTo", ManagementClientConstants.ServiceBusNamespace), filter.ReplyTo), + new XElement(XName.Get("ReplyTo", AdministrationClientConstants.ServiceBusNamespace), filter.ReplyTo), string.IsNullOrWhiteSpace(filter.Subject) ? null : - new XElement(XName.Get("Label", ManagementClientConstants.ServiceBusNamespace), filter.Subject), + new XElement(XName.Get("Label", AdministrationClientConstants.ServiceBusNamespace), filter.Subject), string.IsNullOrWhiteSpace(filter.SessionId) ? null : - new XElement(XName.Get("SessionId", ManagementClientConstants.ServiceBusNamespace), filter.SessionId), + new XElement(XName.Get("SessionId", AdministrationClientConstants.ServiceBusNamespace), filter.SessionId), string.IsNullOrWhiteSpace(filter.ReplyToSessionId) ? null : - new XElement(XName.Get("ReplyToSessionId", ManagementClientConstants.ServiceBusNamespace), filter.ReplyToSessionId), + new XElement(XName.Get("ReplyToSessionId", AdministrationClientConstants.ServiceBusNamespace), filter.ReplyToSessionId), string.IsNullOrWhiteSpace(filter.ContentType) ? null : - new XElement(XName.Get("ContentType", ManagementClientConstants.ServiceBusNamespace), filter.ContentType), + new XElement(XName.Get("ContentType", AdministrationClientConstants.ServiceBusNamespace), filter.ContentType), parameterElement); } } diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/CreateRuleOptions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/CreateRuleOptions.cs similarity index 99% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/CreateRuleOptions.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/CreateRuleOptions.cs index 2fc829fe6784..8e7f9245ec48 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/CreateRuleOptions.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/CreateRuleOptions.cs @@ -4,7 +4,7 @@ using System; using Azure.Core; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Represents the set of options that can be specified for the creation of a rule. diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/FalseRuleFilter.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/FalseRuleFilter.cs similarity index 97% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/FalseRuleFilter.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/FalseRuleFilter.cs index 506e618b8822..83e130866690 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/FalseRuleFilter.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/FalseRuleFilter.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Matches none the messages arriving to be selected for the subscription. diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/RuleAction.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/RuleAction.cs similarity index 96% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/RuleAction.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/RuleAction.cs index 7cdef96b491b..194017eeccbc 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/RuleAction.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/RuleAction.cs @@ -3,7 +3,7 @@ using System; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Represents the filter actions which are allowed for the transformation diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/RuleActionExtensions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/RuleActionExtensions.cs similarity index 70% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/RuleActionExtensions.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/RuleActionExtensions.cs index 04321d3eefa9..22536441f062 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/RuleActionExtensions.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/RuleActionExtensions.cs @@ -5,13 +5,13 @@ using System.Xml.Linq; using Azure.Messaging.ServiceBus.Diagnostics; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { internal static class RuleActionExtensions { internal static RuleAction ParseFromXElement(XElement xElement) { - var attribute = xElement.Attribute(XName.Get("type", ManagementClientConstants.XmlSchemaInstanceNamespace)); + var attribute = xElement.Attribute(XName.Get("type", AdministrationClientConstants.XmlSchemaInstanceNamespace)); if (attribute == null) { return null; @@ -35,7 +35,7 @@ internal static RuleAction ParseFromXElement(XElement xElement) private static RuleAction ParseFromXElementSqlRuleAction(XElement xElement) { - var expression = xElement.Element(XName.Get("SqlExpression", ManagementClientConstants.ServiceBusNamespace))?.Value; + var expression = xElement.Element(XName.Get("SqlExpression", AdministrationClientConstants.ServiceBusNamespace))?.Value; if (string.IsNullOrWhiteSpace(expression)) { return null; @@ -43,13 +43,13 @@ private static RuleAction ParseFromXElementSqlRuleAction(XElement xElement) var action = new SqlRuleAction(expression); - var parameters = xElement.Element(XName.Get("Parameters", ManagementClientConstants.ServiceBusNamespace)); + var parameters = xElement.Element(XName.Get("Parameters", AdministrationClientConstants.ServiceBusNamespace)); if (parameters != null && parameters.HasElements) { - foreach (var param in parameters.Elements(XName.Get("KeyValueOfstringanyType", ManagementClientConstants.ServiceBusNamespace))) + foreach (var param in parameters.Elements(XName.Get("KeyValueOfstringanyType", AdministrationClientConstants.ServiceBusNamespace))) { - var key = param.Element(XName.Get("Key", ManagementClientConstants.ServiceBusNamespace))?.Value; - var value = XmlObjectConvertor.ParseValueObject(param.Element(XName.Get("Value", ManagementClientConstants.ServiceBusNamespace))); + var key = param.Element(XName.Get("Key", AdministrationClientConstants.ServiceBusNamespace))?.Value; + var value = XmlObjectConvertor.ParseValueObject(param.Element(XName.Get("Value", AdministrationClientConstants.ServiceBusNamespace))); action.Parameters.Add(key, value); } } @@ -63,19 +63,19 @@ public static XElement Serialize(this RuleAction action) XElement parameterElement = new XElement( XName.Get( "Parameters", - ManagementClientConstants.ServiceBusNamespace)); + AdministrationClientConstants.ServiceBusNamespace)); foreach (var param in sqlRuleAction.Parameters) { parameterElement.Add( - new XElement(XName.Get("KeyValueOfstringanyType", ManagementClientConstants.ServiceBusNamespace), - new XElement(XName.Get("Key", ManagementClientConstants.ServiceBusNamespace), param.Key), + new XElement(XName.Get("KeyValueOfstringanyType", AdministrationClientConstants.ServiceBusNamespace), + new XElement(XName.Get("Key", AdministrationClientConstants.ServiceBusNamespace), param.Key), XmlObjectConvertor.SerializeObject(param.Value))); } return new XElement( - XName.Get("Action", ManagementClientConstants.ServiceBusNamespace), - new XAttribute(XName.Get("type", ManagementClientConstants.XmlSchemaInstanceNamespace), nameof(SqlRuleAction)), - new XElement(XName.Get("SqlExpression", ManagementClientConstants.ServiceBusNamespace), sqlRuleAction.SqlExpression), + XName.Get("Action", AdministrationClientConstants.ServiceBusNamespace), + new XAttribute(XName.Get("type", AdministrationClientConstants.XmlSchemaInstanceNamespace), nameof(SqlRuleAction)), + new XElement(XName.Get("SqlExpression", AdministrationClientConstants.ServiceBusNamespace), sqlRuleAction.SqlExpression), parameterElement); } else diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/RuleDescriptionExtensions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/RuleDescriptionExtensions.cs similarity index 86% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/RuleDescriptionExtensions.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/RuleDescriptionExtensions.cs index 8807b5160a3c..a0acec3e75ff 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/RuleDescriptionExtensions.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/RuleDescriptionExtensions.cs @@ -8,7 +8,7 @@ using Azure.Core; using Azure.Messaging.ServiceBus.Primitives; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { internal static class RuleDescriptionExtensions { @@ -73,7 +73,7 @@ public static List ParseCollectionFromContent(string xml) { var rules = new List(); - var entryList = xDoc.Elements(XName.Get("entry", ManagementClientConstants.AtomNamespace)); + var entryList = xDoc.Elements(XName.Get("entry", AdministrationClientConstants.AtomNamespace)); foreach (var entry in entryList) { rules.Add(ParseFromEntryElement(entry)); @@ -93,11 +93,11 @@ public static List ParseCollectionFromContent(string xml) private static RuleProperties ParseFromEntryElement(XElement xEntry) { - var name = xEntry.Element(XName.Get("title", ManagementClientConstants.AtomNamespace)).Value; + var name = xEntry.Element(XName.Get("title", AdministrationClientConstants.AtomNamespace)).Value; var ruleDescription = new RuleProperties(); - var rdXml = xEntry.Element(XName.Get("content", ManagementClientConstants.AtomNamespace))? - .Element(XName.Get("RuleDescription", ManagementClientConstants.ServiceBusNamespace)); + var rdXml = xEntry.Element(XName.Get("content", AdministrationClientConstants.AtomNamespace))? + .Element(XName.Get("RuleDescription", AdministrationClientConstants.ServiceBusNamespace)); if (rdXml == null) { @@ -129,8 +129,8 @@ private static RuleProperties ParseFromEntryElement(XElement xEntry) public static XDocument Serialize(this RuleProperties description) { XDocument doc = new XDocument( - new XElement(XName.Get("entry", ManagementClientConstants.AtomNamespace), - new XElement(XName.Get("content", ManagementClientConstants.AtomNamespace), + new XElement(XName.Get("entry", AdministrationClientConstants.AtomNamespace), + new XElement(XName.Get("content", AdministrationClientConstants.AtomNamespace), new XAttribute("type", "application/xml"), description.SerializeRule()))); @@ -140,10 +140,10 @@ public static XDocument Serialize(this RuleProperties description) public static XElement SerializeRule(this RuleProperties description, string elementName = "RuleDescription") { return new XElement( - XName.Get(elementName, ManagementClientConstants.ServiceBusNamespace), + XName.Get(elementName, AdministrationClientConstants.ServiceBusNamespace), description.Filter?.Serialize(), description.Action?.Serialize(), - new XElement(XName.Get("Name", ManagementClientConstants.ServiceBusNamespace), description.Name)); + new XElement(XName.Get("Name", AdministrationClientConstants.ServiceBusNamespace), description.Name)); } } } diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/RuleFilter.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/RuleFilter.cs similarity index 96% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/RuleFilter.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/RuleFilter.cs index e07426603157..0fb7e2e40b2a 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/RuleFilter.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/RuleFilter.cs @@ -3,7 +3,7 @@ using System; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Describes a filter expression that is evaluated against a Message. diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/RuleFilterExtensions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/RuleFilterExtensions.cs similarity index 95% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/RuleFilterExtensions.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/RuleFilterExtensions.cs index 1ce1a0e2edd9..11ed7169efdd 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/RuleFilterExtensions.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/RuleFilterExtensions.cs @@ -5,13 +5,13 @@ using System.Xml.Linq; using Azure.Messaging.ServiceBus.Diagnostics; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { internal static class RuleFilterExtensions { public static RuleFilter ParseFromXElement(XElement xElement) { - var attribute = xElement.Attribute(XName.Get("type", ManagementClientConstants.XmlSchemaInstanceNamespace)); + var attribute = xElement.Attribute(XName.Get("type", AdministrationClientConstants.XmlSchemaInstanceNamespace)); if (attribute == null) { return null; diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/RuleProperties.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/RuleProperties.cs similarity index 98% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/RuleProperties.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/RuleProperties.cs index 06928ccd1ba5..5fed17ed4bd5 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/RuleProperties.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/RuleProperties.cs @@ -4,7 +4,7 @@ using System; using Azure.Core; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Represents the properties of a rule. diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/SqlRuleAction.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/SqlRuleAction.cs similarity index 98% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/SqlRuleAction.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/SqlRuleAction.cs index 9ab900acfb71..f1300d6a0bb3 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/SqlRuleAction.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/SqlRuleAction.cs @@ -7,7 +7,7 @@ using Azure.Core; using Azure.Messaging.ServiceBus.Primitives; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Represents set of actions written in SQL language-based syntax that is performed against a . diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/SqlRuleFilter.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/SqlRuleFilter.cs similarity index 98% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/SqlRuleFilter.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/SqlRuleFilter.cs index 1b486d45988e..4c625aa12ae7 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/SqlRuleFilter.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/SqlRuleFilter.cs @@ -7,7 +7,7 @@ using Azure.Core; using Azure.Messaging.ServiceBus.Primitives; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Represents a filter which is a composition of an expression and an action that is executed in the pub/sub pipeline. diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/SqlRuleFilterExtensions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/SqlRuleFilterExtensions.cs similarity index 59% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/SqlRuleFilterExtensions.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/SqlRuleFilterExtensions.cs index b913bf07dab8..fa35a9fb9f3f 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/SqlRuleFilterExtensions.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/SqlRuleFilterExtensions.cs @@ -3,13 +3,13 @@ using System.Xml.Linq; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { internal static class SqlRuleFilterExtensions { internal static RuleFilter ParseFromXElement(XElement xElement) { - var expression = xElement.Element(XName.Get("SqlExpression", ManagementClientConstants.ServiceBusNamespace))?.Value; + var expression = xElement.Element(XName.Get("SqlExpression", AdministrationClientConstants.ServiceBusNamespace))?.Value; if (string.IsNullOrWhiteSpace(expression)) { return null; @@ -17,13 +17,13 @@ internal static RuleFilter ParseFromXElement(XElement xElement) var filter = new SqlRuleFilter(expression); - var parameters = xElement.Element(XName.Get("Parameters", ManagementClientConstants.ServiceBusNamespace)); + var parameters = xElement.Element(XName.Get("Parameters", AdministrationClientConstants.ServiceBusNamespace)); if (parameters != null && parameters.HasElements) { - foreach (var param in parameters.Elements(XName.Get("KeyValueOfstringanyType", ManagementClientConstants.ServiceBusNamespace))) + foreach (var param in parameters.Elements(XName.Get("KeyValueOfstringanyType", AdministrationClientConstants.ServiceBusNamespace))) { - var key = param.Element(XName.Get("Key", ManagementClientConstants.ServiceBusNamespace))?.Value; - var value = XmlObjectConvertor.ParseValueObject(param.Element(XName.Get("Value", ManagementClientConstants.ServiceBusNamespace))); + var key = param.Element(XName.Get("Key", AdministrationClientConstants.ServiceBusNamespace))?.Value; + var value = XmlObjectConvertor.ParseValueObject(param.Element(XName.Get("Value", AdministrationClientConstants.ServiceBusNamespace))); filter.Parameters.Add(key, value); } } @@ -35,20 +35,20 @@ public static XElement Serialize(this SqlRuleFilter filter, string filterName) XElement parameterElement = null; if (filter.Parameters != null) { - parameterElement = new XElement(XName.Get("Parameters", ManagementClientConstants.ServiceBusNamespace)); + parameterElement = new XElement(XName.Get("Parameters", AdministrationClientConstants.ServiceBusNamespace)); foreach (var param in filter.Parameters) { parameterElement.Add( - new XElement(XName.Get("KeyValueOfstringanyType", ManagementClientConstants.ServiceBusNamespace), - new XElement(XName.Get("Key", ManagementClientConstants.ServiceBusNamespace), param.Key), + new XElement(XName.Get("KeyValueOfstringanyType", AdministrationClientConstants.ServiceBusNamespace), + new XElement(XName.Get("Key", AdministrationClientConstants.ServiceBusNamespace), param.Key), XmlObjectConvertor.SerializeObject(param.Value))); } } return new XElement( - XName.Get("Filter", ManagementClientConstants.ServiceBusNamespace), - new XAttribute(XName.Get("type", ManagementClientConstants.XmlSchemaInstanceNamespace), filterName), - new XElement(XName.Get("SqlExpression", ManagementClientConstants.ServiceBusNamespace), filter.SqlExpression), + XName.Get("Filter", AdministrationClientConstants.ServiceBusNamespace), + new XAttribute(XName.Get("type", AdministrationClientConstants.XmlSchemaInstanceNamespace), filterName), + new XElement(XName.Get("SqlExpression", AdministrationClientConstants.ServiceBusNamespace), filter.SqlExpression), parameterElement); } } diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/TrueRuleFilter.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/TrueRuleFilter.cs similarity index 97% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/TrueRuleFilter.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/TrueRuleFilter.cs index 8ad0d810c1e5..ce4645d7cc74 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/TrueRuleFilter.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/TrueRuleFilter.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Matches all the messages arriving to be selected for the subscription. diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/XmlObjectConvertor.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/XmlObjectConvertor.cs similarity index 83% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/XmlObjectConvertor.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/XmlObjectConvertor.cs index 529189cae94d..b94b4cd1e5ab 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/Rules/XmlObjectConvertor.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/Rules/XmlObjectConvertor.cs @@ -6,14 +6,14 @@ using System.Xml.Linq; using Azure.Messaging.ServiceBus.Diagnostics; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { internal class XmlObjectConvertor { internal static object ParseValueObject(XElement element) { - var serializedPrefix = element.GetPrefixOfNamespace(XNamespace.Get(ManagementClientConstants.SerializationNamespace)); - var type = element.Attribute(XName.Get("type", ManagementClientConstants.XmlSchemaInstanceNamespace)).Value; + var serializedPrefix = element.GetPrefixOfNamespace(XNamespace.Get(AdministrationClientConstants.SerializationNamespace)); + var type = element.Attribute(XName.Get("type", AdministrationClientConstants.XmlSchemaInstanceNamespace)).Value; if (!string.IsNullOrEmpty(serializedPrefix)) { @@ -23,7 +23,7 @@ internal static object ParseValueObject(XElement element) } } - var prefix = element.GetPrefixOfNamespace(XNamespace.Get(ManagementClientConstants.XmlSchemaNamespace)); + var prefix = element.GetPrefixOfNamespace(XNamespace.Get(AdministrationClientConstants.XmlSchemaNamespace)); if (string.IsNullOrWhiteSpace(prefix)) { return element.Value; @@ -96,9 +96,9 @@ internal static XElement SerializeObject(object value) "Only following types are supported through HTTP: string,int,long,bool,double,DateTime"); } - var element = new XElement(XName.Get("Value", ManagementClientConstants.ServiceBusNamespace), - new XAttribute(XName.Get("type", ManagementClientConstants.XmlSchemaInstanceNamespace), type), - new XAttribute(XNamespace.Xmlns + prefix, ManagementClientConstants.XmlSchemaNamespace), + var element = new XElement(XName.Get("Value", AdministrationClientConstants.ServiceBusNamespace), + new XAttribute(XName.Get("type", AdministrationClientConstants.XmlSchemaInstanceNamespace), type), + new XAttribute(XNamespace.Xmlns + prefix, AdministrationClientConstants.XmlSchemaNamespace), value); return element; diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/ServiceBusManagementClient.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/ServiceBusAdministrationClient.cs similarity index 91% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/ServiceBusManagementClient.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/ServiceBusAdministrationClient.cs index 7a7202905e4d..a2e4934d52c3 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/ServiceBusManagementClient.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/ServiceBusAdministrationClient.cs @@ -11,13 +11,13 @@ using Azure.Messaging.ServiceBus.Authorization; using Azure.Messaging.ServiceBus.Core; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// - /// The is the client through which all Service Bus + /// The is the client through which all Service Bus /// entities can be created, updated, fetched and deleted. /// - public class ServiceBusManagementClient + public class ServiceBusAdministrationClient { private readonly string _fullyQualifiedNamespace; private readonly HttpRequestAndResponse _httpRequestAndResponse; @@ -51,30 +51,30 @@ public class ServiceBusManagementClient /// /// Parameterless constructor to allow mocking. /// - protected ServiceBusManagementClient() { } + protected ServiceBusAdministrationClient() { } /// - /// Initializes a new which can be used to perform management operations on ServiceBus entities. + /// Initializes a new which can be used to perform administration operations on ServiceBus entities. /// /// /// Namespace connection string. - public ServiceBusManagementClient(string connectionString) - : this(connectionString, new ServiceBusManagementClientOptions()) + public ServiceBusAdministrationClient(string connectionString) + : this(connectionString, new ServiceBusAdministrationClientOptions()) { } /// - /// Initializes a new which can be used to perform management operations on ServiceBus entities. + /// Initializes a new which can be used to perform administration operations on ServiceBus entities. /// /// /// Namespace connection string. /// - public ServiceBusManagementClient( + public ServiceBusAdministrationClient( string connectionString, - ServiceBusManagementClientOptions options) + ServiceBusAdministrationClientOptions options) { Argument.AssertNotNullOrEmpty(connectionString, nameof(connectionString)); - options ??= new ServiceBusManagementClientOptions(); + options ??= new ServiceBusAdministrationClientOptions(); ConnectionStringProperties connectionStringProperties = ConnectionStringParser.Parse(connectionString); if (string.IsNullOrEmpty(connectionStringProperties.Endpoint?.Host) @@ -110,34 +110,34 @@ public ServiceBusManagementClient( } /// - /// Initializes a new which can be used to perform management operations on ServiceBus entities. + /// Initializes a new which can be used to perform administration operations on ServiceBus entities. /// /// /// The fully qualified Service Bus namespace to connect to. This is likely to be similar to {yournamespace}.servicebus.windows.net. /// The Azure managed identity credential to use for authorization. Access controls may be specified by the Service Bus namespace or the requested Service Bus entity, depending on Azure configuration. - public ServiceBusManagementClient( + public ServiceBusAdministrationClient( string fullyQualifiedNamespace, TokenCredential credential) - : this(fullyQualifiedNamespace, credential, new ServiceBusManagementClientOptions()) + : this(fullyQualifiedNamespace, credential, new ServiceBusAdministrationClientOptions()) { } /// - /// Initializes a new which can be used to perform management operations on ServiceBus entities. + /// Initializes a new which can be used to perform administration operations on ServiceBus entities. /// /// /// The fully qualified Service Bus namespace to connect to. This is likely to be similar to {yournamespace}.servicebus.windows.net. /// The Azure managed identity credential to use for authorization. Access controls may be specified by the Service Bus namespace or the requested Service Bus entity, depending on Azure configuration. /// A set of options to apply when configuring the connection. - public ServiceBusManagementClient( + public ServiceBusAdministrationClient( string fullyQualifiedNamespace, TokenCredential credential, - ServiceBusManagementClientOptions options) + ServiceBusAdministrationClientOptions options) { Argument.AssertWellFormedServiceBusNamespace(fullyQualifiedNamespace, nameof(fullyQualifiedNamespace)); Argument.AssertNotNull(credential, nameof(credential)); - options ??= new ServiceBusManagementClientOptions(); + options ??= new ServiceBusAdministrationClientOptions(); _fullyQualifiedNamespace = fullyQualifiedNamespace; switch (credential) @@ -175,7 +175,7 @@ public ServiceBusManagementClient( /// containing namespace information. public virtual async Task> GetNamespacePropertiesAsync(CancellationToken cancellationToken = default) { - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.GetNamespaceProperties"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.GetNamespaceProperties"); scope.Start(); try @@ -210,7 +210,7 @@ public virtual async Task> GetNamespacePropertiesA /// The length of name is greater than 260. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. /// Queue with this name does not exist. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or an unexpected exception occured. public virtual async Task DeleteQueueAsync( @@ -218,7 +218,7 @@ public virtual async Task DeleteQueueAsync( CancellationToken cancellationToken = default) { EntityNameFormatter.CheckValidQueueName(name); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.DeleteQueue"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.DeleteQueue"); scope.Start(); try @@ -243,7 +243,7 @@ public virtual async Task DeleteQueueAsync( /// The length of topic name is greater than 260. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. /// Topic with this name does not exist. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or an unexpected exception occured. public virtual async Task DeleteTopicAsync( @@ -251,7 +251,7 @@ public virtual async Task DeleteTopicAsync( CancellationToken cancellationToken = default) { EntityNameFormatter.CheckValidTopicName(name); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.DeleteTopic"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.DeleteTopic"); scope.Start(); try @@ -277,7 +277,7 @@ public virtual async Task DeleteTopicAsync( /// The length of topic name is greater than 260 or length of subscription name is greater than 50. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. /// Subscription with this name does not exist. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or an unexpected exception occured. public virtual async Task DeleteSubscriptionAsync( @@ -287,7 +287,7 @@ public virtual async Task DeleteSubscriptionAsync( { EntityNameFormatter.CheckValidTopicName(topicName); EntityNameFormatter.CheckValidSubscriptionName(subscriptionName); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.DeleteSubscription"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.DeleteSubscription"); scope.Start(); try @@ -314,7 +314,7 @@ public virtual async Task DeleteSubscriptionAsync( /// The length of topic name is greater than 260 or length of subscription-name/rule-name is greater than 50. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. /// Rule with this name does not exist. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or an unexpected exception occured. public virtual async Task DeleteRuleAsync( @@ -326,7 +326,7 @@ public virtual async Task DeleteRuleAsync( EntityNameFormatter.CheckValidTopicName(topicName); EntityNameFormatter.CheckValidSubscriptionName(subscriptionName); EntityNameFormatter.CheckValidRuleName(ruleName); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.DeleteRule"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.DeleteRule"); scope.Start(); try @@ -356,7 +356,7 @@ public virtual async Task DeleteRuleAsync( /// The length of queue name is greater than 260. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. /// Queue with this name does not exist. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or an unexpected exception occured. public virtual async Task> GetQueueAsync( @@ -364,7 +364,7 @@ public virtual async Task> GetQueueAsync( CancellationToken cancellationToken = default) { EntityNameFormatter.CheckValidQueueName(name); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.GetQueue"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.GetQueue"); scope.Start(); try @@ -393,7 +393,7 @@ public virtual async Task> GetQueueAsync( /// The length of topic name is greater than 260. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. /// Topic with this name does not exist. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or an unexpected exception occured. public virtual async Task> GetTopicAsync( @@ -401,7 +401,7 @@ public virtual async Task> GetTopicAsync( CancellationToken cancellationToken = default) { EntityNameFormatter.CheckValidTopicName(name); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.GetTopic"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.GetTopic"); scope.Start(); try @@ -432,7 +432,7 @@ public virtual async Task> GetTopicAsync( /// The length of topic name is greater than 260 or length of subscription-name is greater than 50. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. /// Topic or Subscription with this name does not exist. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or an unexpected exception occured. public virtual async Task> GetSubscriptionAsync( @@ -442,7 +442,7 @@ public virtual async Task> GetSubscriptionAsync { EntityNameFormatter.CheckValidTopicName(topicName); EntityNameFormatter.CheckValidSubscriptionName(subscriptionName); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.GetSubscription"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.GetSubscription"); scope.Start(); try { @@ -475,7 +475,7 @@ public virtual async Task> GetSubscriptionAsync /// The length of topic name is greater than 260 or length of subscription-name/rule-name is greater than 50. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. /// Topic/Subscription/Rule with this name does not exist. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or an unexpected exception occured. public virtual async Task> GetRuleAsync( @@ -488,7 +488,7 @@ public virtual async Task> GetRuleAsync( EntityNameFormatter.CheckValidSubscriptionName(subscriptionName); EntityNameFormatter.CheckValidRuleName(ruleName); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.GetRule"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.GetRule"); scope.Start(); try @@ -521,7 +521,7 @@ public virtual async Task> GetRuleAsync( /// The length of queue name is greater than 260. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. /// Queue with this name does not exist. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or an unexpected exception occured. public virtual async Task> GetQueueRuntimePropertiesAsync( @@ -529,7 +529,7 @@ public virtual async Task> GetQueueRuntimePrope CancellationToken cancellationToken = default) { EntityNameFormatter.CheckValidQueueName(name); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.GetQueueRuntimeProperties"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.GetQueueRuntimeProperties"); scope.Start(); try @@ -558,7 +558,7 @@ public virtual async Task> GetQueueRuntimePrope /// The length of topic name is greater than 260. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. /// Topic with this name does not exist. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or an unexpected exception occured. public virtual async Task> GetTopicRuntimePropertiesAsync( @@ -566,7 +566,7 @@ public virtual async Task> GetTopicRuntimePrope CancellationToken cancellationToken = default) { EntityNameFormatter.CheckValidTopicName(name); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.GetTopicRuntimeProperties"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.GetTopicRuntimeProperties"); scope.Start(); try @@ -597,7 +597,7 @@ public virtual async Task> GetTopicRuntimePrope /// The length of topic name is greater than 260 or length of subscription-name is greater than 50. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. /// Topic or Subscription with this name does not exist. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or an unexpected exception occured. public virtual async Task> GetSubscriptionRuntimePropertiesAsync( @@ -607,7 +607,7 @@ public virtual async Task> GetSubscripti { EntityNameFormatter.CheckValidTopicName(topicName); EntityNameFormatter.CheckValidSubscriptionName(subscriptionName); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.GetSubscriptionRuntimeProperties"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.GetSubscriptionRuntimeProperties"); scope.Start(); try @@ -638,12 +638,12 @@ public virtual async Task> GetSubscripti /// Maximum value allowed is 100 per page. /// If the parameters are out of range. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or an unexpected exception occured. public virtual AsyncPageable GetQueuesAsync(CancellationToken cancellationToken = default) { - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.GetQueues"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.GetQueues"); scope.Start(); try @@ -671,12 +671,12 @@ public virtual AsyncPageable GetQueuesAsync(CancellationToken c /// Maximum value allowed is 100 per page. /// If the parameters are out of range. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or an unexpected exception occured. public virtual AsyncPageable GetTopicsAsync(CancellationToken cancellationToken = default) { - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.GetTopic"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.GetTopic"); scope.Start(); try @@ -705,7 +705,7 @@ public virtual AsyncPageable GetTopicsAsync(CancellationToken c /// Maximum value allowed is 100 per page. /// If the parameters are out of range. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or an unexpected exception occured. public virtual AsyncPageable GetSubscriptionsAsync( @@ -713,7 +713,7 @@ public virtual AsyncPageable GetSubscriptionsAsync( CancellationToken cancellationToken = default) { EntityNameFormatter.CheckValidTopicName(topicName); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.GetSubscription"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.GetSubscription"); scope.Start(); try { @@ -742,7 +742,7 @@ public virtual AsyncPageable GetSubscriptionsAsync( /// Maximum value allowed is 100 per page. /// If the parameters are out of range. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or an unexpected exception occured. public virtual AsyncPageable GetRulesAsync( @@ -752,7 +752,7 @@ public virtual AsyncPageable GetRulesAsync( { EntityNameFormatter.CheckValidTopicName(topicName); EntityNameFormatter.CheckValidSubscriptionName(subscriptionName); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.GetRules"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.GetRules"); scope.Start(); try @@ -783,12 +783,12 @@ public virtual AsyncPageable GetRulesAsync( /// Maximum value allowed is 100 per page. /// If the parameters are out of range. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or an unexpected exception occured. public virtual AsyncPageable GetQueuesRuntimePropertiesAsync(CancellationToken cancellationToken = default) { - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.GetQueuesRuntimeProperties"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.GetQueuesRuntimeProperties"); scope.Start(); try @@ -816,12 +816,12 @@ public virtual AsyncPageable GetQueuesRuntimePropertiesA /// Maximum value allowed is 100 per page. /// If the parameters are out of range. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or an unexpected exception occured. public virtual AsyncPageable GetTopicsRuntimePropertiesAsync(CancellationToken cancellationToken = default) { - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.GetTopicsRuntimeProperties"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.GetTopicsRuntimeProperties"); scope.Start(); try { @@ -848,7 +848,7 @@ public virtual AsyncPageable GetTopicsRuntimePropertiesA /// Maximum value allowed is 100 per page. /// If the parameters are out of range. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or an unexpected exception occured. public virtual AsyncPageable GetSubscriptionsRuntimePropertiesAsync( @@ -856,7 +856,7 @@ public virtual AsyncPageable GetSubscriptionsRunt CancellationToken cancellationToken = default) { EntityNameFormatter.CheckValidTopicName(topicName); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.GetSubscriptionsRuntimeProperties"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.GetSubscriptionsRuntimeProperties"); scope.Start(); try { @@ -890,7 +890,7 @@ public virtual AsyncPageable GetSubscriptionsRunt /// The length of is greater than 260 characters. /// An entity with the same name exists under the same service namespace. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// Either the specified size in the description is not supported or the maximum allowable quota has been reached. You must specify one of the supported size values, delete existing entities, or increase your quota size. /// The server is busy. You should wait before you retry the operation. /// An internal error or unexpected exception occurs. @@ -912,7 +912,7 @@ await CreateQueueAsync( /// Queue name is null or empty. /// An entity with the same name exists under the same service namespace. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// Either the specified size in the description is not supported or the maximum allowable quota has been reached. You must specify one of the supported size values, delete existing entities, or increase your quota size. /// The server is busy. You should wait before you retry the operation. /// An internal error or unexpected exception occurs. @@ -921,7 +921,7 @@ public virtual async Task> CreateQueueAsync( CancellationToken cancellationToken = default) { Argument.AssertNotNull(options, nameof(options)); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.CreateQueue"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.CreateQueue"); scope.Start(); try { @@ -960,7 +960,7 @@ public virtual async Task> CreateQueueAsync( /// The length of is greater than 260 characters. /// A topic with the same name exists under the same service namespace. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// Either the specified size in the description is not supported or the maximum allowable quota has been reached. You must specify one of the supported size values, delete existing entities, or increase your quota size. /// The server is busy. You should wait before you retry the operation. /// An internal error or unexpected exception occurs. @@ -983,7 +983,7 @@ await CreateTopicAsync( /// Topic description is null. /// A topic with the same name exists under the same service namespace. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// Either the specified size in the description is not supported or the maximum allowable quota has been reached. You must specify one of the supported size values, delete existing entities, or increase your quota size. /// The server is busy. You should wait before you retry the operation. /// An internal error or unexpected exception occurs. @@ -992,7 +992,7 @@ public virtual async Task> CreateTopicAsync( CancellationToken cancellationToken = default) { Argument.AssertNotNull(options, nameof(options)); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.CreateTopic"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.CreateTopic"); scope.Start(); try @@ -1035,7 +1035,7 @@ public virtual async Task> CreateTopicAsync( /// The length of is greater than 260 characters or is greater than 50 characters. /// A subscription with the same name exists under the same service namespace. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// Either the specified size in the description is not supported or the maximum allowable quota has been reached. You must specify one of the supported size values, delete existing entities, or increase your quota size. /// The server is busy. You should wait before you retry the operation. /// An internal error or unexpected exception occurs. @@ -1061,7 +1061,7 @@ await CreateSubscriptionAsync( /// Subscription description is null. /// A subscription with the same name exists under the same service namespace. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// Either the specified size in the description is not supported or the maximum allowable quota has been reached. You must specify one of the supported size values, delete existing entities, or increase your quota size. /// The server is busy. You should wait before you retry the operation. /// An internal error or unexpected exception occurs. @@ -1086,7 +1086,7 @@ public virtual Task> CreateSubscriptionAsync( /// Subscription description is null. /// A subscription with the same name exists under the same service namespace. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// Either the specified size in the description is not supported or the maximum allowable quota has been reached. You must specify one of the supported size values, delete existing entities, or increase your quota size. /// The server is busy. You should wait before you retry the operation. /// An internal error or unexpected exception occurs. @@ -1096,7 +1096,7 @@ public virtual async Task> CreateSubscriptionAs CancellationToken cancellationToken = default) { options = options ?? throw new ArgumentNullException(nameof(options)); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.CreateSubscription"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.CreateSubscription"); scope.Start(); try @@ -1137,7 +1137,7 @@ public virtual async Task> CreateSubscriptionAs /// Subscription or rule description is null. /// A subscription with the same name exists under the same service namespace. /// The operation times out. The timeout period is initialized through the class. You may need to increase the value of timeout to avoid this exception if the timeout value is relatively low. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// Either the specified size in the description is not supported or the maximum allowable quota has been reached. You must specify one of the supported size values, delete existing entities, or increase your quota size. /// The server is busy. You should wait before you retry the operation. /// An internal error or unexpected exception occurs. @@ -1152,7 +1152,7 @@ public virtual async Task> CreateRuleAsync( EntityNameFormatter.CheckValidSubscriptionName(subscriptionName); options = options ?? throw new ArgumentNullException(nameof(options)); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.CreateRule"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.CreateRule"); scope.Start(); try @@ -1193,7 +1193,7 @@ public virtual async Task> CreateRuleAsync( /// Queue descriptor is null. /// Described queue was not found. /// The operation times out. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// Either the specified size in the description is not supported or the maximum allowable quota has been reached. You must specify one of the supported size values, delete existing entities, or increase your quota size. /// The server is busy. You should wait before you retry the operation. /// An internal error or unexpected exception occurs. @@ -1203,7 +1203,7 @@ public virtual async Task> UpdateQueueAsync( { queue = queue ?? throw new ArgumentNullException(nameof(queue)); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.UpdateQueue"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.UpdateQueue"); scope.Start(); try @@ -1241,7 +1241,7 @@ public virtual async Task> UpdateQueueAsync( /// Topic descriptor is null. /// Described topic was not found. /// The operation times out. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// Either the specified size in the description is not supported or the maximum allowable quota has been reached. You must specify one of the supported size values, delete existing entities, or increase your quota size. /// The server is busy. You should wait before you retry the operation. /// An internal error or unexpected exception occurs. @@ -1250,7 +1250,7 @@ public virtual async Task> UpdateTopicAsync( CancellationToken cancellationToken = default) { topic = topic ?? throw new ArgumentNullException(nameof(topic)); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.UpdateTopic"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.UpdateTopic"); scope.Start(); try @@ -1287,7 +1287,7 @@ public virtual async Task> UpdateTopicAsync( /// subscription descriptor is null. /// Described subscription was not found. /// The operation times out. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// Either the specified size in the description is not supported or the maximum allowable quota has been reached. You must specify one of the supported size values, delete existing entities, or increase your quota size. /// The server is busy. You should wait before you retry the operation. /// An internal error or unexpected exception occurs. @@ -1297,7 +1297,7 @@ public virtual async Task> UpdateSubscriptionAs { subscription = subscription ?? throw new ArgumentNullException(nameof(subscription)); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.UpdateSubscription"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.UpdateSubscription"); scope.Start(); try @@ -1337,7 +1337,7 @@ public virtual async Task> UpdateSubscriptionAs /// rule descriptor is null. /// Described topic/subscription/rule was not found. /// The operation times out. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// Either the specified size in the description is not supported or the maximum allowable quota has been reached. You must specify one of the supported size values, delete existing entities, or increase your quota size. /// The server is busy. You should wait before you retry the operation. /// An internal error or unexpected exception occurs. @@ -1349,7 +1349,7 @@ public virtual async Task> UpdateRuleAsync( { rule = rule ?? throw new ArgumentNullException(nameof(rule)); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.UpdateRule"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.UpdateRule"); scope.Start(); try @@ -1390,7 +1390,7 @@ public virtual async Task> UpdateRuleAsync( /// True if queue exists, false otherwise. /// Queue name provided is not valid. /// The operation times out. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or unexpected exception occurs. public virtual async Task> QueueExistsAsync( @@ -1398,7 +1398,7 @@ public virtual async Task> QueueExistsAsync( CancellationToken cancellationToken = default) { EntityNameFormatter.CheckValidQueueName(name); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.QueueExists"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.QueueExists"); scope.Start(); try { @@ -1433,7 +1433,7 @@ public virtual async Task> QueueExistsAsync( /// True if topic exists, false otherwise. /// topic name provided is not valid. /// The operation times out. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or unexpected exception occurs. public virtual async Task> TopicExistsAsync( @@ -1441,7 +1441,7 @@ public virtual async Task> TopicExistsAsync( CancellationToken cancellationToken = default) { EntityNameFormatter.CheckValidTopicName(name); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.TopicExists"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.TopicExists"); scope.Start(); try @@ -1479,7 +1479,7 @@ public virtual async Task> TopicExistsAsync( /// True if subscription exists, false otherwise. /// topic or subscription name provided is not valid. /// The operation times out. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or unexpected exception occurs. public virtual async Task> SubscriptionExistsAsync( @@ -1489,7 +1489,7 @@ public virtual async Task> SubscriptionExistsAsync( { EntityNameFormatter.CheckValidTopicName(topicName); EntityNameFormatter.CheckValidSubscriptionName(subscriptionName); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.SubscriptionExists"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.SubscriptionExists"); scope.Start(); try @@ -1528,7 +1528,7 @@ public virtual async Task> SubscriptionExistsAsync( /// True if subscription exists, false otherwise. /// topic or subscription name provided is not valid. /// The operation times out. - /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. + /// No sufficient permission to perform this operation. You should check to ensure that your has the correct credentials to perform this operation. /// The server is busy. You should wait before you retry the operation. /// An internal error or unexpected exception occurs. public virtual async Task> RuleExistsAsync( @@ -1539,7 +1539,7 @@ public virtual async Task> RuleExistsAsync( { EntityNameFormatter.CheckValidTopicName(topicName); EntityNameFormatter.CheckValidSubscriptionName(subscriptionName); - using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusManagementClient)}.RuleExists"); + using DiagnosticScope scope = _clientDiagnostics.CreateScope($"{nameof(ServiceBusAdministrationClient)}.RuleExists"); scope.Start(); try diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/ServiceBusManagementClientOptions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/ServiceBusAdministrationClientOptions.cs similarity index 86% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/ServiceBusManagementClientOptions.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/ServiceBusAdministrationClientOptions.cs index e7b303641770..c4a4d7e0e34d 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/ServiceBusManagementClientOptions.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/ServiceBusAdministrationClientOptions.cs @@ -4,28 +4,28 @@ using System.ComponentModel; using Azure.Core; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// - /// The set of options that can be specified when creating an + /// The set of options that can be specified when creating an /// to configure its behavior. /// - public class ServiceBusManagementClientOptions : ClientOptions + public class ServiceBusAdministrationClientOptions : ClientOptions { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// /// The of the service API used when /// making requests. /// - public ServiceBusManagementClientOptions(ServiceVersion version = ServiceVersion.V2017_04) + public ServiceBusAdministrationClientOptions(ServiceVersion version = ServiceVersion.V2017_04) { Version = version; } /// - /// The versions of Service Bus Management supported by this client + /// The versions of Service Bus Administration supported by this client /// library. /// public enum ServiceVersion diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/ServiceVersionExtensions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/ServiceVersionExtensions.cs similarity index 76% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/ServiceVersionExtensions.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/ServiceVersionExtensions.cs index c104d188d904..4cca6c75d7d5 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/ServiceVersionExtensions.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/ServiceVersionExtensions.cs @@ -2,9 +2,9 @@ // Licensed under the MIT License. using System; -using static Azure.Messaging.ServiceBus.Management.ServiceBusManagementClientOptions; +using static Azure.Messaging.ServiceBus.Administration.ServiceBusAdministrationClientOptions; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { internal static class ServiceVersionExtensions { diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/SharedAccessAuthorizationRule.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/SharedAccessAuthorizationRule.cs similarity index 91% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/SharedAccessAuthorizationRule.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/SharedAccessAuthorizationRule.cs index 3d5dfc228b72..1c6f41301d96 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/SharedAccessAuthorizationRule.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/SharedAccessAuthorizationRule.cs @@ -12,7 +12,7 @@ using Azure.Core; using Azure.Messaging.ServiceBus.Authorization; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Defines the authorization rule for an entity using SAS. @@ -162,9 +162,9 @@ public override List Rights get => internalRights; set { - if (value == null || value.Count < 0 || value.Count > ManagementClientConstants.SupportedClaimsCount) + if (value == null || value.Count < 0 || value.Count > AdministrationClientConstants.SupportedClaimsCount) { - throw new ArgumentException($"Rights cannot be null, empty or greater than {ManagementClientConstants.SupportedClaimsCount}"); + throw new ArgumentException($"Rights cannot be null, empty or greater than {AdministrationClientConstants.SupportedClaimsCount}"); } HashSet dedupedAccessRights = new HashSet(value); @@ -313,7 +313,7 @@ private static bool CheckBase64(string base64EncodedString) break; case "Rights": var rights = new List(); - var xRights = element.Elements(XName.Get("AccessRights", ManagementClientConstants.ServiceBusNamespace)); + var xRights = element.Elements(XName.Get("AccessRights", AdministrationClientConstants.ServiceBusNamespace)); foreach (var xRight in xRights) { rights.Add((AccessRights)Enum.Parse(typeof(AccessRights), xRight.Value)); @@ -329,15 +329,15 @@ private static bool CheckBase64(string base64EncodedString) internal override XElement Serialize() { XElement rule = new XElement( - XName.Get("AuthorizationRule", ManagementClientConstants.ServiceBusNamespace), - new XAttribute(XName.Get("type", ManagementClientConstants.XmlSchemaInstanceNamespace), nameof(SharedAccessAuthorizationRule)), - new XElement(XName.Get("ClaimType", ManagementClientConstants.ServiceBusNamespace), ClaimType), - new XElement(XName.Get("ClaimValue", ManagementClientConstants.ServiceBusNamespace), ClaimValue), - new XElement(XName.Get("Rights", ManagementClientConstants.ServiceBusNamespace), - Rights.Select(right => new XElement(XName.Get("AccessRights", ManagementClientConstants.ServiceBusNamespace), right.ToString()))), - new XElement(XName.Get("KeyName", ManagementClientConstants.ServiceBusNamespace), KeyName), - new XElement(XName.Get("PrimaryKey", ManagementClientConstants.ServiceBusNamespace), PrimaryKey), - new XElement(XName.Get("SecondaryKey", ManagementClientConstants.ServiceBusNamespace), SecondaryKey) + XName.Get("AuthorizationRule", AdministrationClientConstants.ServiceBusNamespace), + new XAttribute(XName.Get("type", AdministrationClientConstants.XmlSchemaInstanceNamespace), nameof(SharedAccessAuthorizationRule)), + new XElement(XName.Get("ClaimType", AdministrationClientConstants.ServiceBusNamespace), ClaimType), + new XElement(XName.Get("ClaimValue", AdministrationClientConstants.ServiceBusNamespace), ClaimValue), + new XElement(XName.Get("Rights", AdministrationClientConstants.ServiceBusNamespace), + Rights.Select(right => new XElement(XName.Get("AccessRights", AdministrationClientConstants.ServiceBusNamespace), right.ToString()))), + new XElement(XName.Get("KeyName", AdministrationClientConstants.ServiceBusNamespace), KeyName), + new XElement(XName.Get("PrimaryKey", AdministrationClientConstants.ServiceBusNamespace), PrimaryKey), + new XElement(XName.Get("SecondaryKey", AdministrationClientConstants.ServiceBusNamespace), SecondaryKey) ); return rule; diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/SubscriptionProperties.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/SubscriptionProperties.cs similarity index 96% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/SubscriptionProperties.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/SubscriptionProperties.cs index e1a5fb0fa7b2..9eb290bd7390 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/SubscriptionProperties.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/SubscriptionProperties.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using Azure.Core; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Represents the static properties of the subscription. @@ -93,8 +93,8 @@ public TimeSpan DefaultMessageTimeToLive { Argument.AssertInRange( value, - ManagementClientConstants.MinimumAllowedTimeToLive, - ManagementClientConstants.MaximumAllowedTimeToLive, + AdministrationClientConstants.MinimumAllowedTimeToLive, + AdministrationClientConstants.MaximumAllowedTimeToLive, nameof(DefaultMessageTimeToLive)); _defaultMessageTimeToLive = value; @@ -112,7 +112,7 @@ public TimeSpan AutoDeleteOnIdle { Argument.AssertAtLeast( value, - ManagementClientConstants.MinimumAllowedAutoDeleteOnIdle, + AdministrationClientConstants.MinimumAllowedAutoDeleteOnIdle, nameof(AutoDeleteOnIdle)); _autoDeleteOnIdle = value; @@ -174,7 +174,7 @@ public int MaxDeliveryCount { Argument.AssertAtLeast( value, - ManagementClientConstants.MinAllowedMaxDeliveryCount, + AdministrationClientConstants.MinAllowedMaxDeliveryCount, nameof(AutoDeleteOnIdle)); _maxDeliveryCount = value; @@ -257,7 +257,7 @@ public string UserMetadata Argument.AssertNotNull(value, nameof(UserMetadata)); Argument.AssertNotTooLong( value, - ManagementClientConstants.MaxUserMetadataLength, + AdministrationClientConstants.MaxUserMetadataLength, nameof(UserMetadata)); _userMetadata = value; diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/SubscriptionPropertiesExtensions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/SubscriptionPropertiesExtensions.cs similarity index 76% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/SubscriptionPropertiesExtensions.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/SubscriptionPropertiesExtensions.cs index b67c507cda13..eb681b9e495e 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/SubscriptionPropertiesExtensions.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/SubscriptionPropertiesExtensions.cs @@ -7,7 +7,7 @@ using System.Xml; using System.Xml.Linq; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { internal static class SubscriptionPropertiesExtensions { @@ -68,7 +68,7 @@ public static List ParseCollectionFromContent(string top { var subscriptionList = new List(); - var entryList = xDoc.Elements(XName.Get("entry", ManagementClientConstants.AtomNamespace)); + var entryList = xDoc.Elements(XName.Get("entry", AdministrationClientConstants.AtomNamespace)); foreach (var entry in entryList) { subscriptionList.Add(ParseFromEntryElement(topicName, entry)); @@ -88,11 +88,11 @@ public static List ParseCollectionFromContent(string top private static SubscriptionProperties ParseFromEntryElement(string topicName, XElement xEntry) { - var name = xEntry.Element(XName.Get("title", ManagementClientConstants.AtomNamespace)).Value; + var name = xEntry.Element(XName.Get("title", AdministrationClientConstants.AtomNamespace)).Value; var subscriptionDesc = new SubscriptionProperties(topicName, name); - var qdXml = xEntry.Element(XName.Get("content", ManagementClientConstants.AtomNamespace))? - .Element(XName.Get("SubscriptionDescription", ManagementClientConstants.ServiceBusNamespace)); + var qdXml = xEntry.Element(XName.Get("content", AdministrationClientConstants.AtomNamespace))? + .Element(XName.Get("SubscriptionDescription", AdministrationClientConstants.ServiceBusNamespace)); if (qdXml == null) { @@ -173,19 +173,19 @@ public static XDocument Serialize(this SubscriptionProperties description) { var subscriptionDescriptionElements = new List() { - new XElement(XName.Get("LockDuration", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.LockDuration)), - new XElement(XName.Get("RequiresSession", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.RequiresSession)), - description.DefaultMessageTimeToLive != TimeSpan.MaxValue ? new XElement(XName.Get("DefaultMessageTimeToLive", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.DefaultMessageTimeToLive)) : null, - new XElement(XName.Get("DeadLetteringOnMessageExpiration", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.DeadLetteringOnMessageExpiration)), - new XElement(XName.Get("DeadLetteringOnFilterEvaluationExceptions", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.EnableDeadLetteringOnFilterEvaluationExceptions)), + new XElement(XName.Get("LockDuration", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.LockDuration)), + new XElement(XName.Get("RequiresSession", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.RequiresSession)), + description.DefaultMessageTimeToLive != TimeSpan.MaxValue ? new XElement(XName.Get("DefaultMessageTimeToLive", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.DefaultMessageTimeToLive)) : null, + new XElement(XName.Get("DeadLetteringOnMessageExpiration", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.DeadLetteringOnMessageExpiration)), + new XElement(XName.Get("DeadLetteringOnFilterEvaluationExceptions", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.EnableDeadLetteringOnFilterEvaluationExceptions)), description.Rule != null ? description.Rule.SerializeRule("DefaultRuleDescription") : null, - new XElement(XName.Get("MaxDeliveryCount", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.MaxDeliveryCount)), - new XElement(XName.Get("EnableBatchedOperations", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.EnableBatchedOperations)), - new XElement(XName.Get("Status", ManagementClientConstants.ServiceBusNamespace), description.Status.ToString()), - description.ForwardTo != null ? new XElement(XName.Get("ForwardTo", ManagementClientConstants.ServiceBusNamespace), description.ForwardTo) : null, - description.UserMetadata != null ? new XElement(XName.Get("UserMetadata", ManagementClientConstants.ServiceBusNamespace), description.UserMetadata) : null, - description.ForwardDeadLetteredMessagesTo != null ? new XElement(XName.Get("ForwardDeadLetteredMessagesTo", ManagementClientConstants.ServiceBusNamespace), description.ForwardDeadLetteredMessagesTo) : null, - description.AutoDeleteOnIdle != TimeSpan.MaxValue ? new XElement(XName.Get("AutoDeleteOnIdle", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.AutoDeleteOnIdle)) : null + new XElement(XName.Get("MaxDeliveryCount", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.MaxDeliveryCount)), + new XElement(XName.Get("EnableBatchedOperations", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.EnableBatchedOperations)), + new XElement(XName.Get("Status", AdministrationClientConstants.ServiceBusNamespace), description.Status.ToString()), + description.ForwardTo != null ? new XElement(XName.Get("ForwardTo", AdministrationClientConstants.ServiceBusNamespace), description.ForwardTo) : null, + description.UserMetadata != null ? new XElement(XName.Get("UserMetadata", AdministrationClientConstants.ServiceBusNamespace), description.UserMetadata) : null, + description.ForwardDeadLetteredMessagesTo != null ? new XElement(XName.Get("ForwardDeadLetteredMessagesTo", AdministrationClientConstants.ServiceBusNamespace), description.ForwardDeadLetteredMessagesTo) : null, + description.AutoDeleteOnIdle != TimeSpan.MaxValue ? new XElement(XName.Get("AutoDeleteOnIdle", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.AutoDeleteOnIdle)) : null }; if (description.UnknownProperties != null) @@ -194,10 +194,10 @@ public static XDocument Serialize(this SubscriptionProperties description) } return new XDocument( - new XElement(XName.Get("entry", ManagementClientConstants.AtomNamespace), - new XElement(XName.Get("content", ManagementClientConstants.AtomNamespace), + new XElement(XName.Get("entry", AdministrationClientConstants.AtomNamespace), + new XElement(XName.Get("content", AdministrationClientConstants.AtomNamespace), new XAttribute("type", "application/xml"), - new XElement(XName.Get("SubscriptionDescription", ManagementClientConstants.ServiceBusNamespace), + new XElement(XName.Get("SubscriptionDescription", AdministrationClientConstants.ServiceBusNamespace), subscriptionDescriptionElements )) )); diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/SubscriptionRuntimeProperties.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/SubscriptionRuntimeProperties.cs similarity index 97% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/SubscriptionRuntimeProperties.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/SubscriptionRuntimeProperties.cs index 3b1d289456d2..438765dffaea 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/SubscriptionRuntimeProperties.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/SubscriptionRuntimeProperties.cs @@ -3,7 +3,7 @@ using System; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// This provides runtime properties of the subscription. diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/SubscriptionRuntimePropertiesExtensions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/SubscriptionRuntimePropertiesExtensions.cs similarity index 91% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/SubscriptionRuntimePropertiesExtensions.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/SubscriptionRuntimePropertiesExtensions.cs index 087c26098b13..4efd89bb5ef7 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/SubscriptionRuntimePropertiesExtensions.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/SubscriptionRuntimePropertiesExtensions.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Globalization; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { internal static class SubscriptionRuntimePropertiesExtensions { @@ -33,11 +33,11 @@ public static SubscriptionRuntimeProperties ParseFromContent(string topicName, s private static SubscriptionRuntimeProperties ParseFromEntryElement(string topicName, XElement xEntry) { - var name = xEntry.Element(XName.Get("title", ManagementClientConstants.AtomNamespace)).Value; + var name = xEntry.Element(XName.Get("title", AdministrationClientConstants.AtomNamespace)).Value; var subscriptionRuntimeInfo = new SubscriptionRuntimeProperties(topicName, name); - var qdXml = xEntry.Element(XName.Get("content", ManagementClientConstants.AtomNamespace))? - .Element(XName.Get("SubscriptionDescription", ManagementClientConstants.ServiceBusNamespace)); + var qdXml = xEntry.Element(XName.Get("content", AdministrationClientConstants.AtomNamespace))? + .Element(XName.Get("SubscriptionDescription", AdministrationClientConstants.ServiceBusNamespace)); if (qdXml == null) { @@ -97,7 +97,7 @@ public static List ParseCollectionFromContent(str { var subscriptionList = new List(); - var entryList = xDoc.Elements(XName.Get("entry", ManagementClientConstants.AtomNamespace)); + var entryList = xDoc.Elements(XName.Get("entry", AdministrationClientConstants.AtomNamespace)); foreach (var entry in entryList) { subscriptionList.Add(ParseFromEntryElement(topicPath, entry)); diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/TopicProperties.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/TopicProperties.cs similarity index 94% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/TopicProperties.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/TopicProperties.cs index a763a2e814ac..b275c4eb3fc9 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/TopicProperties.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/TopicProperties.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using Azure.Core; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Represents the static properties of the topic. @@ -65,8 +65,8 @@ public TimeSpan DefaultMessageTimeToLive { Argument.AssertInRange( value, - ManagementClientConstants.MinimumAllowedTimeToLive, - ManagementClientConstants.MaximumAllowedTimeToLive, + AdministrationClientConstants.MinimumAllowedTimeToLive, + AdministrationClientConstants.MaximumAllowedTimeToLive, nameof(DefaultMessageTimeToLive)); _defaultMessageTimeToLive = value; @@ -84,7 +84,7 @@ public TimeSpan AutoDeleteOnIdle { Argument.AssertAtLeast( value, - ManagementClientConstants.MinimumAllowedAutoDeleteOnIdle, + AdministrationClientConstants.MinimumAllowedAutoDeleteOnIdle, nameof(AutoDeleteOnIdle)); _autoDeleteOnIdle = value; @@ -118,8 +118,8 @@ public TimeSpan DuplicateDetectionHistoryTimeWindow { Argument.AssertInRange( value, - ManagementClientConstants.MinimumDuplicateDetectionHistoryTimeWindow, - ManagementClientConstants.MaximumDuplicateDetectionHistoryTimeWindow, + AdministrationClientConstants.MinimumDuplicateDetectionHistoryTimeWindow, + AdministrationClientConstants.MaximumDuplicateDetectionHistoryTimeWindow, nameof(DuplicateDetectionHistoryTimeWindow)); _duplicateDetectionHistoryTimeWindow = value; @@ -183,7 +183,7 @@ public string UserMetadata Argument.AssertNotNull(value, nameof(UserMetadata)); Argument.AssertNotTooLong( value, - ManagementClientConstants.MaxUserMetadataLength, + AdministrationClientConstants.MaxUserMetadataLength, nameof(UserMetadata)); _userMetadata = value; diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/TopicPropertiesExtensions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/TopicPropertiesExtensions.cs similarity index 75% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/TopicPropertiesExtensions.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/TopicPropertiesExtensions.cs index b39de4036a4a..3802270d4313 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/TopicPropertiesExtensions.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/TopicPropertiesExtensions.cs @@ -7,7 +7,7 @@ using System.Xml; using System.Xml.Linq; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { internal static class TopicPropertiesExtensions { @@ -43,7 +43,7 @@ public static List ParseCollectionFromContent(string xml) { var topicList = new List(); - var entryList = xDoc.Elements(XName.Get("entry", ManagementClientConstants.AtomNamespace)); + var entryList = xDoc.Elements(XName.Get("entry", AdministrationClientConstants.AtomNamespace)); foreach (var entry in entryList) { topicList.Add(ParseFromEntryElement(entry)); @@ -63,11 +63,11 @@ public static List ParseCollectionFromContent(string xml) private static TopicProperties ParseFromEntryElement(XElement xEntry) { - var name = xEntry.Element(XName.Get("title", ManagementClientConstants.AtomNamespace)).Value; + var name = xEntry.Element(XName.Get("title", AdministrationClientConstants.AtomNamespace)).Value; var topicDesc = new TopicProperties(name); - var qdXml = xEntry.Element(XName.Get("content", ManagementClientConstants.AtomNamespace))? - .Element(XName.Get("TopicDescription", ManagementClientConstants.ServiceBusNamespace)); + var qdXml = xEntry.Element(XName.Get("content", AdministrationClientConstants.AtomNamespace))? + .Element(XName.Get("TopicDescription", AdministrationClientConstants.ServiceBusNamespace)); if (qdXml == null) { @@ -140,19 +140,19 @@ public static XDocument Serialize(this TopicProperties description) { var topicDescriptionElements = new List { - description.DefaultMessageTimeToLive != TimeSpan.MaxValue ? new XElement(XName.Get("DefaultMessageTimeToLive", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.DefaultMessageTimeToLive)) : null, - new XElement(XName.Get("MaxSizeInMegabytes", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.MaxSizeInMegabytes)), - new XElement(XName.Get("RequiresDuplicateDetection", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.RequiresDuplicateDetection)), + description.DefaultMessageTimeToLive != TimeSpan.MaxValue ? new XElement(XName.Get("DefaultMessageTimeToLive", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.DefaultMessageTimeToLive)) : null, + new XElement(XName.Get("MaxSizeInMegabytes", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.MaxSizeInMegabytes)), + new XElement(XName.Get("RequiresDuplicateDetection", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.RequiresDuplicateDetection)), description.RequiresDuplicateDetection && description.DuplicateDetectionHistoryTimeWindow != default ? - new XElement(XName.Get("DuplicateDetectionHistoryTimeWindow", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.DuplicateDetectionHistoryTimeWindow)) + new XElement(XName.Get("DuplicateDetectionHistoryTimeWindow", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.DuplicateDetectionHistoryTimeWindow)) : null, - new XElement(XName.Get("EnableBatchedOperations", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.EnableBatchedOperations)), + new XElement(XName.Get("EnableBatchedOperations", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.EnableBatchedOperations)), description.AuthorizationRules?.Serialize(), - new XElement(XName.Get("Status", ManagementClientConstants.ServiceBusNamespace), description.Status.ToString()), - description.UserMetadata != null ? new XElement(XName.Get("UserMetadata", ManagementClientConstants.ServiceBusNamespace), description.UserMetadata) : null, - new XElement(XName.Get("SupportOrdering", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.SupportOrdering)), - description.AutoDeleteOnIdle != TimeSpan.MaxValue ? new XElement(XName.Get("AutoDeleteOnIdle", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.AutoDeleteOnIdle)) : null, - new XElement(XName.Get("EnablePartitioning", ManagementClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.EnablePartitioning)) + new XElement(XName.Get("Status", AdministrationClientConstants.ServiceBusNamespace), description.Status.ToString()), + description.UserMetadata != null ? new XElement(XName.Get("UserMetadata", AdministrationClientConstants.ServiceBusNamespace), description.UserMetadata) : null, + new XElement(XName.Get("SupportOrdering", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.SupportOrdering)), + description.AutoDeleteOnIdle != TimeSpan.MaxValue ? new XElement(XName.Get("AutoDeleteOnIdle", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.AutoDeleteOnIdle)) : null, + new XElement(XName.Get("EnablePartitioning", AdministrationClientConstants.ServiceBusNamespace), XmlConvert.ToString(description.EnablePartitioning)) }; if (description.UnknownProperties != null) @@ -161,10 +161,10 @@ public static XDocument Serialize(this TopicProperties description) } XDocument doc = new XDocument( - new XElement(XName.Get("entry", ManagementClientConstants.AtomNamespace), - new XElement(XName.Get("content", ManagementClientConstants.AtomNamespace), + new XElement(XName.Get("entry", AdministrationClientConstants.AtomNamespace), + new XElement(XName.Get("content", AdministrationClientConstants.AtomNamespace), new XAttribute("type", "application/xml"), - new XElement(XName.Get("TopicDescription", ManagementClientConstants.ServiceBusNamespace), + new XElement(XName.Get("TopicDescription", AdministrationClientConstants.ServiceBusNamespace), topicDescriptionElements )) )); diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/TopicRuntimeProperties.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/TopicRuntimeProperties.cs similarity index 96% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/TopicRuntimeProperties.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/TopicRuntimeProperties.cs index 3f05193c43b2..b09dd8cf1d2e 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/TopicRuntimeProperties.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/TopicRuntimeProperties.cs @@ -3,7 +3,7 @@ using System; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { /// /// Represents the runtime properties of the topic. diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/TopicRuntimePropertiesExtensions.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/TopicRuntimePropertiesExtensions.cs similarity index 90% rename from sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/TopicRuntimePropertiesExtensions.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/TopicRuntimePropertiesExtensions.cs index e00386e068d3..96c2e7e2a6a7 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Management/TopicRuntimePropertiesExtensions.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Administration/TopicRuntimePropertiesExtensions.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Globalization; -namespace Azure.Messaging.ServiceBus.Management +namespace Azure.Messaging.ServiceBus.Administration { internal static class TopicRuntimePropertiesExtensions { @@ -33,11 +33,11 @@ public static TopicRuntimeProperties ParseFromContent(string xml) public static TopicRuntimeProperties ParseFromEntryElement(XElement xEntry) { - var name = xEntry.Element(XName.Get("title", ManagementClientConstants.AtomNamespace)).Value; + var name = xEntry.Element(XName.Get("title", AdministrationClientConstants.AtomNamespace)).Value; var topicRuntimeInfo = new TopicRuntimeProperties(name); - var qdXml = xEntry.Element(XName.Get("content", ManagementClientConstants.AtomNamespace))? - .Element(XName.Get("TopicDescription", ManagementClientConstants.ServiceBusNamespace)); + var qdXml = xEntry.Element(XName.Get("content", AdministrationClientConstants.AtomNamespace))? + .Element(XName.Get("TopicDescription", AdministrationClientConstants.ServiceBusNamespace)); if (qdXml == null) { @@ -92,7 +92,7 @@ public static List ParseCollectionFromContent(string xml { var topicList = new List(); - var entryList = xDoc.Elements(XName.Get("entry", ManagementClientConstants.AtomNamespace)); + var entryList = xDoc.Elements(XName.Get("entry", AdministrationClientConstants.AtomNamespace)); foreach (var entry in entryList) { topicList.Add(ParseFromEntryElement(entry)); diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs index 24696df46467..3c8037555289 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpMessageConverter.cs @@ -10,7 +10,7 @@ using Azure.Core; using Azure.Core.Amqp; using Azure.Messaging.ServiceBus.Amqp.Framing; -using Azure.Messaging.ServiceBus.Management; +using Azure.Messaging.ServiceBus.Administration; using Azure.Messaging.ServiceBus.Primitives; using Microsoft.Azure.Amqp; using Microsoft.Azure.Amqp.Encoding; diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpRuleManager.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpRuleManager.cs index 7eb18374457b..bc9c92fdad9f 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpRuleManager.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpRuleManager.cs @@ -8,7 +8,7 @@ using Azure.Core; using Azure.Messaging.ServiceBus.Amqp.Framing; using Azure.Messaging.ServiceBus.Core; -using Azure.Messaging.ServiceBus.Management; +using Azure.Messaging.ServiceBus.Administration; using Microsoft.Azure.Amqp; using Microsoft.Azure.Amqp.Encoding; diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Core/TransportRuleManager.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Core/TransportRuleManager.cs index 849de52bac14..5ca5572fc5ef 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Core/TransportRuleManager.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Core/TransportRuleManager.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Azure.Messaging.ServiceBus.Management; +using Azure.Messaging.ServiceBus.Administration; namespace Azure.Messaging.ServiceBus.Core { diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/EntityNameFormatter.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/EntityNameFormatter.cs index 98cabdd32999..f643d6f2d79a 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/EntityNameFormatter.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/EntityNameFormatter.cs @@ -2,7 +2,7 @@ // Licensed under the MIT License. using System; -using Azure.Messaging.ServiceBus.Management; +using Azure.Messaging.ServiceBus.Administration; namespace Azure.Messaging.ServiceBus { @@ -76,22 +76,22 @@ public static string FormatRulePath(string topicPath, string subscriptionName, s internal static void CheckValidQueueName(string queueName, string paramName = "queuePath") { - CheckValidEntityName(GetPathWithoutBaseUri(queueName), ManagementClientConstants.QueueNameMaximumLength, true, paramName); + CheckValidEntityName(GetPathWithoutBaseUri(queueName), AdministrationClientConstants.QueueNameMaximumLength, true, paramName); } internal static void CheckValidTopicName(string topicName, string paramName = "topicPath") { - CheckValidEntityName(topicName, ManagementClientConstants.TopicNameMaximumLength, true, paramName); + CheckValidEntityName(topicName, AdministrationClientConstants.TopicNameMaximumLength, true, paramName); } internal static void CheckValidSubscriptionName(string subscriptionName, string paramName = "subscriptionName") { - CheckValidEntityName(subscriptionName, ManagementClientConstants.SubscriptionNameMaximumLength, false, paramName); + CheckValidEntityName(subscriptionName, AdministrationClientConstants.SubscriptionNameMaximumLength, false, paramName); } internal static void CheckValidRuleName(string ruleName, string paramName = "ruleName") { - CheckValidEntityName(ruleName, ManagementClientConstants.RuleNameMaximumLength, false, paramName); + CheckValidEntityName(ruleName, AdministrationClientConstants.RuleNameMaximumLength, false, paramName); } private static void CheckValidEntityName(string entityName, int maxEntityNameLength, bool allowSeparator, string paramName) @@ -120,7 +120,7 @@ private static void CheckValidEntityName(string entityName, int maxEntityNameLen throw new ArgumentException($@"The entity name/path contains an invalid character '{Constants.PathDelimiter}'", paramName); } - foreach (var uriSchemeKey in ManagementClientConstants.InvalidEntityPathCharacters) + foreach (var uriSchemeKey in AdministrationClientConstants.InvalidEntityPathCharacters) { if (entityName.IndexOf(uriSchemeKey) >= 0) { diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusModelFactory.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusModelFactory.cs index 27c1f82490a1..1a06b5e29f49 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusModelFactory.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusModelFactory.cs @@ -6,7 +6,7 @@ using System.ComponentModel; using Azure.Core.Amqp; using Azure.Messaging.ServiceBus.Amqp; -using Azure.Messaging.ServiceBus.Management; +using Azure.Messaging.ServiceBus.Administration; namespace Azure.Messaging.ServiceBus { diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/src/RuleManager/ServiceBusRuleManager.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/src/RuleManager/ServiceBusRuleManager.cs index 790a0205fc2a..1e4c354a2bc3 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/src/RuleManager/ServiceBusRuleManager.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/src/RuleManager/ServiceBusRuleManager.cs @@ -9,7 +9,7 @@ using Azure.Core; using Azure.Messaging.ServiceBus.Core; using Azure.Messaging.ServiceBus.Diagnostics; -using Azure.Messaging.ServiceBus.Management; +using Azure.Messaging.ServiceBus.Administration; namespace Azure.Messaging.ServiceBus { diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/QueuePropertiesTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/QueuePropertiesTests.cs similarity index 96% rename from sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/QueuePropertiesTests.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/QueuePropertiesTests.cs index ed23f52cb94a..ab02cbb90ff9 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/QueuePropertiesTests.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/QueuePropertiesTests.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Azure.Messaging.ServiceBus.Management; +using Azure.Messaging.ServiceBus.Administration; using NUnit.Framework; namespace Azure.Messaging.ServiceBus.Tests.Management @@ -31,7 +31,7 @@ public void AutoDeleteOnIdleThrowsOutOfRangeException() var sub = new QueueProperties("Fake Name"); ArgumentOutOfRangeException ex = Assert.Throws(() => sub.AutoDeleteOnIdle = TimeSpan.FromMinutes(2)); - Assert.AreEqual($"The value supplied must be greater than or equal to {ManagementClientConstants.MinimumAllowedAutoDeleteOnIdle}.{Environment.NewLine}Parameter name: AutoDeleteOnIdle", ex.Message); + Assert.AreEqual($"The value supplied must be greater than or equal to {AdministrationClientConstants.MinimumAllowedAutoDeleteOnIdle}.{Environment.NewLine}Parameter name: AutoDeleteOnIdle", ex.Message); Assert.AreEqual($"AutoDeleteOnIdle", ex.ParamName); } diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/RequestResponseTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/RequestResponseTests.cs similarity index 96% rename from sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/RequestResponseTests.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/RequestResponseTests.cs index 0070f6b65a03..ef4fe3266c94 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/RequestResponseTests.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/RequestResponseTests.cs @@ -8,7 +8,7 @@ using Azure.Core; using Azure.Core.Pipeline; using Azure.Core.TestFramework; -using Azure.Messaging.ServiceBus.Management; +using Azure.Messaging.ServiceBus.Administration; using NUnit.Framework; namespace Azure.Messaging.ServiceBus.Tests.Management @@ -18,9 +18,9 @@ public class RequestResponseTests private readonly HttpRequestAndResponse _requestResponse; public RequestResponseTests() { - var options = new ServiceBusManagementClientOptions(); + var options = new ServiceBusAdministrationClientOptions(); var pipeline = HttpPipelineBuilder.Build(options); - _requestResponse = new HttpRequestAndResponse(pipeline, new ClientDiagnostics(options), null, "fakeNamespace", ServiceBusManagementClientOptions.ServiceVersion.V2017_04); + _requestResponse = new HttpRequestAndResponse(pipeline, new ClientDiagnostics(options), null, "fakeNamespace", ServiceBusAdministrationClientOptions.ServiceVersion.V2017_04); } [Test] @@ -162,7 +162,7 @@ public async Task ThrowsInvalidOperationOnForbiddenSubcode() { MockResponse response = new MockResponse( (int)HttpStatusCode.Forbidden, - ManagementClientConstants.ForbiddenInvalidOperationSubCode); + AdministrationClientConstants.ForbiddenInvalidOperationSubCode); var request = new MockRequest() { Method = RequestMethod.Put }; await _requestResponse.ThrowIfRequestFailedAsync(request, response); } diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/RulePropertiesTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/RulePropertiesTests.cs similarity index 94% rename from sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/RulePropertiesTests.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/RulePropertiesTests.cs index f77ed694c2bb..0dab7d93feef 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/RulePropertiesTests.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/RulePropertiesTests.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -using Azure.Messaging.ServiceBus.Management; +using Azure.Messaging.ServiceBus.Administration; using NUnit.Framework; namespace Azure.Messaging.ServiceBus.Tests.Management diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/ServiceBusManagementClientLiveTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/ServiceBusManagementClientLiveTests.cs similarity index 99% rename from sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/ServiceBusManagementClientLiveTests.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/ServiceBusManagementClientLiveTests.cs index 11686e5129d6..fed8f55999e0 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/ServiceBusManagementClientLiveTests.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/ServiceBusManagementClientLiveTests.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using Azure.Core; using Azure.Core.TestFramework; -using Azure.Messaging.ServiceBus.Management; +using Azure.Messaging.ServiceBus.Administration; using Azure.Messaging.ServiceBus.Tests.Infrastructure; using NUnit.Framework; @@ -29,18 +29,18 @@ private string GetConnectionString() => TestEnvironment.OverrideServiceBusConnectionString : TestEnvironment.ServiceBusConnectionString; - private ServiceBusManagementClient GetClient() => + private ServiceBusAdministrationClient GetClient() => InstrumentClient( - new ServiceBusManagementClient( + new ServiceBusAdministrationClient( GetConnectionString(), - Recording.InstrumentClientOptions(new ServiceBusManagementClientOptions()))); + Recording.InstrumentClientOptions(new ServiceBusAdministrationClientOptions()))); - private ServiceBusManagementClient GetAADClient() => + private ServiceBusAdministrationClient GetAADClient() => InstrumentClient( - new ServiceBusManagementClient( + new ServiceBusAdministrationClient( TestEnvironment.FullyQualifiedNamespace, GetTokenCredential(), - Recording.InstrumentClientOptions(new ServiceBusManagementClientOptions()))); + Recording.InstrumentClientOptions(new ServiceBusAdministrationClientOptions()))); [Test] public async Task BasicQueueCrudOperations() diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/ServiceVersionTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/ServiceVersionTests.cs similarity index 63% rename from sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/ServiceVersionTests.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/ServiceVersionTests.cs index 98edc3fffddc..033e4455ffa1 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/ServiceVersionTests.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/ServiceVersionTests.cs @@ -2,7 +2,7 @@ // Licensed under the MIT License. using System; -using Azure.Messaging.ServiceBus.Management; +using Azure.Messaging.ServiceBus.Administration; using NUnit.Framework; namespace Azure.Messaging.ServiceBus.Tests.Management @@ -18,16 +18,16 @@ public void ServiceVersionValidated() // default enum of 0 should throw // https://azure.github.io/azure-sdk/dotnet_introduction.html#dotnet-versioning Assert.That( - () => new ServiceBusManagementClient(fakeConnection, new ServiceBusManagementClientOptions(default)), + () => new ServiceBusAdministrationClient(fakeConnection, new ServiceBusAdministrationClientOptions(default)), Throws.InstanceOf()); // doesn't throw - var client = new ServiceBusManagementClient(fakeConnection, new ServiceBusManagementClientOptions()); + var client = new ServiceBusAdministrationClient(fakeConnection, new ServiceBusAdministrationClientOptions()); // doesn't throw - client = new ServiceBusManagementClient( + client = new ServiceBusAdministrationClient( fakeConnection, - new ServiceBusManagementClientOptions(ServiceBusManagementClientOptions.ServiceVersion.V2017_04)); + new ServiceBusAdministrationClientOptions(ServiceBusAdministrationClientOptions.ServiceVersion.V2017_04)); } } } diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/SubscriptionPropertiesTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/SubscriptionPropertiesTests.cs similarity index 98% rename from sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/SubscriptionPropertiesTests.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/SubscriptionPropertiesTests.cs index bdb41a4b4246..dddaf8241529 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/SubscriptionPropertiesTests.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/SubscriptionPropertiesTests.cs @@ -3,7 +3,7 @@ using System; using System.Linq; -using Azure.Messaging.ServiceBus.Management; +using Azure.Messaging.ServiceBus.Administration; using NUnit.Framework; namespace Azure.Messaging.ServiceBus.Tests.Management diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/TopicPropertiesTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/TopicPropertiesTests.cs similarity index 96% rename from sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/TopicPropertiesTests.cs rename to sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/TopicPropertiesTests.cs index 05b7baceb40a..9f8821f01d94 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Management/TopicPropertiesTests.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Administration/TopicPropertiesTests.cs @@ -2,7 +2,7 @@ // Licensed under the MIT License. using System; -using Azure.Messaging.ServiceBus.Management; +using Azure.Messaging.ServiceBus.Administration; using NUnit.Framework; namespace Azure.Messaging.ServiceBus.Tests.Management diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/RuleManager/RuleManagerLiveTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/RuleManager/RuleManagerLiveTests.cs index 9f0a5e8db552..fc5daebe230f 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/RuleManager/RuleManagerLiveTests.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/RuleManager/RuleManagerLiveTests.cs @@ -7,7 +7,7 @@ using System.Text; using System.Text.Json; using System.Threading.Tasks; -using Azure.Messaging.ServiceBus.Management; +using Azure.Messaging.ServiceBus.Administration; using NUnit.Framework; namespace Azure.Messaging.ServiceBus.Tests.RuleManager diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/RuleManager/RuleTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/RuleManager/RuleTests.cs index 07d0df0aaf3b..1d9c96323c18 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/RuleManager/RuleTests.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/RuleManager/RuleTests.cs @@ -2,7 +2,7 @@ // Licensed under the MIT License. using System; -using Azure.Messaging.ServiceBus.Management; +using Azure.Messaging.ServiceBus.Administration; using NUnit.Framework; namespace Azure.Messaging.ServiceBus.Tests.RuleManager diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Samples/Sample07_CrudOperations.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Samples/Sample07_CrudOperations.cs index e6e0772ba0ea..153419e75839 100644 --- a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Samples/Sample07_CrudOperations.cs +++ b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Samples/Sample07_CrudOperations.cs @@ -3,7 +3,7 @@ using System; using System.Threading.Tasks; -using Azure.Messaging.ServiceBus.Management; +using Azure.Messaging.ServiceBus.Administration; using Moq; using NUnit.Framework; @@ -22,7 +22,7 @@ public async Task CreateQueue() #region Snippet:CreateQueue //@@ string connectionString = ""; //@@ string queueName = ""; - var client = new ServiceBusManagementClient(connectionString); + var client = new ServiceBusAdministrationClient(connectionString); var options = new CreateQueueOptions(queueName) { AutoDeleteOnIdle = TimeSpan.FromDays(7), @@ -51,7 +51,7 @@ public async Task CreateQueue() } finally { - await new ServiceBusManagementClient(connectionString).DeleteQueueAsync(queueName); + await new ServiceBusAdministrationClient(connectionString).DeleteQueueAsync(queueName); } } @@ -60,7 +60,7 @@ public async Task GetUpdateDeleteQueue() { string queueName = Guid.NewGuid().ToString("D").Substring(0, 8); string connectionString = TestEnvironment.ServiceBusConnectionString; - var client = new ServiceBusManagementClient(connectionString); + var client = new ServiceBusAdministrationClient(connectionString); var qd = new CreateQueueOptions(queueName); await client.CreateQueueAsync(qd); @@ -88,7 +88,7 @@ public async Task CreateTopicAndSubscription() string topicName = Guid.NewGuid().ToString("D").Substring(0, 8); string subscriptionName = Guid.NewGuid().ToString("D").Substring(0, 8); string connectionString = TestEnvironment.ServiceBusConnectionString; - var client = new ServiceBusManagementClient(connectionString); + var client = new ServiceBusAdministrationClient(connectionString); try { @@ -139,7 +139,7 @@ public async Task GetUpdateDeleteTopicAndSubscription() string topicName = Guid.NewGuid().ToString("D").Substring(0, 8); string subscriptionName = Guid.NewGuid().ToString("D").Substring(0, 8); string connectionString = TestEnvironment.ServiceBusConnectionString; - var client = new ServiceBusManagementClient(connectionString); + var client = new ServiceBusAdministrationClient(connectionString); var topicOptions = new CreateTopicOptions(topicName); var subscriptionOptions = new CreateSubscriptionOptions(topicName, subscriptionName); await client.CreateTopicAsync(topicOptions);