diff --git a/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/CHANGELOG.md b/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/CHANGELOG.md index cb89a188bbc8..c3f67168e4d3 100644 --- a/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/CHANGELOG.md +++ b/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/CHANGELOG.md @@ -1,15 +1,10 @@ # Release History -## 5.0.0-beta.7 (Unreleased) - -### Features Added +## 5.0.0-beta.7 (2021-07-07) ### Breaking Changes -### Key Bugs Fixed - -### Fixed - +- Renamed `MaxBatchSize` to `MaxEventBatchSize` in `EventHubsOptions`. ## 5.0.0-beta.6 (2021-06-09) diff --git a/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/api/Microsoft.Azure.WebJobs.Extensions.EventHubs.netstandard2.0.cs b/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/api/Microsoft.Azure.WebJobs.Extensions.EventHubs.netstandard2.0.cs index 7ca43b37241a..deb7d96865a2 100644 --- a/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/api/Microsoft.Azure.WebJobs.Extensions.EventHubs.netstandard2.0.cs +++ b/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/api/Microsoft.Azure.WebJobs.Extensions.EventHubs.netstandard2.0.cs @@ -28,7 +28,7 @@ public EventHubOptions() { } public System.Uri CustomEndpointAddress { get { throw null; } set { } } public Microsoft.Azure.WebJobs.EventHubs.InitialOffsetOptions InitialOffsetOptions { get { throw null; } } public System.TimeSpan LoadBalancingUpdateInterval { get { throw null; } set { } } - public int MaxBatchSize { get { throw null; } set { } } + public int MaxEventBatchSize { get { throw null; } set { } } public System.TimeSpan PartitionOwnershipExpirationInterval { get { throw null; } set { } } public int PrefetchCount { get { throw null; } set { } } public long? PrefetchSizeInBytes { get { throw null; } set { } } diff --git a/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Config/EventHubClientFactory.cs b/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Config/EventHubClientFactory.cs index 1365777efff3..8e1cafeeba8e 100644 --- a/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Config/EventHubClientFactory.cs +++ b/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Config/EventHubClientFactory.cs @@ -101,7 +101,7 @@ internal EventProcessorHost GetEventProcessorHost(string eventHubName, string co eventHubName: eventHubName, credential: info.TokenCredential, options: _options.EventProcessorOptions, - eventBatchMaximumCount: _options.MaxBatchSize, + eventBatchMaximumCount: _options.MaxEventBatchSize, exceptionHandler: _options.ExceptionHandler); } @@ -109,7 +109,7 @@ internal EventProcessorHost GetEventProcessorHost(string eventHubName, string co connectionString: NormalizeConnectionString(info.ConnectionString, eventHubName), eventHubName: eventHubName, options: _options.EventProcessorOptions, - eventBatchMaximumCount: _options.MaxBatchSize, + eventBatchMaximumCount: _options.MaxEventBatchSize, exceptionHandler: _options.ExceptionHandler); } diff --git a/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Config/EventHubOptions.cs b/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Config/EventHubOptions.cs index 88725ad63cb3..e023502a5dea 100644 --- a/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Config/EventHubOptions.cs +++ b/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Config/EventHubOptions.cs @@ -18,7 +18,7 @@ public class EventHubOptions : IOptionsFormatter { public EventHubOptions() { - MaxBatchSize = 10; + MaxEventBatchSize = 10; ConnectionOptions = new EventHubConnectionOptions() { TransportType = EventHubsTransportType.AmqpTcp @@ -112,14 +112,14 @@ public int BatchCheckpointFrequency } } - private int _maxBatchSize; + private int _maxEventBatchSize; /// /// Gets or sets the maximum number of events delivered in a batch. Default 10. /// - public int MaxBatchSize + public int MaxEventBatchSize { - get => _maxBatchSize; + get => _maxEventBatchSize; set { @@ -127,7 +127,7 @@ public int MaxBatchSize { throw new ArgumentException("Batch size must be larger than 0."); } - _maxBatchSize = value; + _maxEventBatchSize = value; } } @@ -187,7 +187,7 @@ string IOptionsFormatter.Format() { JObject options = new JObject { - { nameof(MaxBatchSize), MaxBatchSize }, + { nameof(MaxEventBatchSize), MaxEventBatchSize }, { nameof(BatchCheckpointFrequency), BatchCheckpointFrequency }, { nameof(TransportType), TransportType.ToString()}, { nameof(WebProxy), WebProxy is WebProxy proxy ? proxy.Address.AbsoluteUri : string.Empty }, diff --git a/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Config/EventHubWebJobsBuilderExtensions.cs b/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Config/EventHubWebJobsBuilderExtensions.cs index b7fe55087b1a..1a82ebf053a7 100644 --- a/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Config/EventHubWebJobsBuilderExtensions.cs +++ b/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/src/Config/EventHubWebJobsBuilderExtensions.cs @@ -48,9 +48,9 @@ public static IWebJobsBuilder AddEventHubs(this IWebJobsBuilder builder, Action< "EventProcessorOptions:EnableReceiverRuntimeMetric", options.TrackLastEnqueuedEventProperties); - options.MaxBatchSize = section.GetValue( + options.MaxEventBatchSize = section.GetValue( "EventProcessorOptions:MaxBatchSize", - options.MaxBatchSize); + options.MaxEventBatchSize); options.PrefetchCount = section.GetValue( "EventProcessorOptions:PrefetchCount", diff --git a/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/tests/EventHubConfigurationTests.cs b/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/tests/EventHubConfigurationTests.cs index dea025ddd3d8..7cc92aeb6657 100644 --- a/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/tests/EventHubConfigurationTests.cs +++ b/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/tests/EventHubConfigurationTests.cs @@ -38,7 +38,7 @@ public void ConfigureOptions_AppliesValuesCorrectly() { EventHubOptions options = CreateOptionsFromConfig(); - Assert.AreEqual(123, options.MaxBatchSize); + Assert.AreEqual(123, options.MaxEventBatchSize); Assert.AreEqual(true, options.EventProcessorOptions.TrackLastEnqueuedEventProperties); Assert.AreEqual(123, options.EventProcessorOptions.PrefetchCount); Assert.AreEqual(5, options.BatchCheckpointFrequency); @@ -69,7 +69,7 @@ public void ConfigureOptions_Format_Returns_Expected() b => { b.AddEventHubs(); }, jsonStream: new BinaryData(jObject.ToString()).ToStream()); - Assert.AreEqual(123, result.MaxBatchSize); + Assert.AreEqual(123, result.MaxEventBatchSize); Assert.AreEqual(5, result.BatchCheckpointFrequency); Assert.True(result.TrackLastEnqueuedEventProperties); Assert.AreEqual(123, result.PrefetchCount); @@ -92,7 +92,7 @@ public void ConfigureOptions_AppliesValuesCorrectly_BackCompat() { EventHubOptions options = CreateOptionsFromConfigBackCompat(); - Assert.AreEqual(123, options.MaxBatchSize); + Assert.AreEqual(123, options.MaxEventBatchSize); Assert.AreEqual(true, options.EventProcessorOptions.TrackLastEnqueuedEventProperties); Assert.AreEqual(123, options.EventProcessorOptions.PrefetchCount); Assert.AreEqual(5, options.BatchCheckpointFrequency); @@ -116,7 +116,7 @@ public void ConfigureOptions_Format_Returns_Expected_BackCompat() b => { b.AddEventHubs(); }, jsonStream: new BinaryData(jObject.ToString()).ToStream()); - Assert.AreEqual(123, result.MaxBatchSize); + Assert.AreEqual(123, result.MaxEventBatchSize); Assert.AreEqual(5, result.BatchCheckpointFrequency); Assert.True(result.TrackLastEnqueuedEventProperties); Assert.AreEqual(123, result.PrefetchCount); @@ -219,7 +219,7 @@ private EventHubOptions CreateOptionsFromConfig() string extensionPath = "AzureWebJobs:Extensions:EventHubs"; var values = new Dictionary { - { $"{extensionPath}:MaxBatchSize", "123" }, + { $"{extensionPath}:MaxEventBatchSize", "123" }, { $"{extensionPath}:TrackLastEnqueuedEventProperties", "true" }, { $"{extensionPath}:PrefetchCount", "123" }, { $"{extensionPath}:BatchCheckpointFrequency", "5" }, diff --git a/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/tests/EventHubTests.cs b/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/tests/EventHubTests.cs index 479685b6bacd..d8631dd30cf2 100644 --- a/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/tests/EventHubTests.cs +++ b/sdk/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/tests/EventHubTests.cs @@ -205,7 +205,7 @@ public void InitializeFromHostMetadata() var eventProcessorOptions = options.EventProcessorOptions; Assert.AreEqual(200, eventProcessorOptions.PrefetchCount); Assert.AreEqual(5, options.BatchCheckpointFrequency); - Assert.AreEqual(100, options.MaxBatchSize); + Assert.AreEqual(100, options.MaxEventBatchSize); Assert.AreEqual(31, options.EventProcessorOptions.PartitionOwnershipExpirationInterval.TotalSeconds); Assert.AreEqual(21, options.EventProcessorOptions.LoadBalancingUpdateInterval.TotalSeconds); Assert.AreEqual(EventPosition.Latest, eventProcessorOptions.DefaultStartingPosition); diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/CHANGELOG.md b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/CHANGELOG.md index 9c77ac2567b4..4f9ba0f34ecb 100644 --- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/CHANGELOG.md +++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/CHANGELOG.md @@ -1,15 +1,11 @@ # Release History -## 5.0.0-beta.5 (Unreleased) - -### Features Added +## 5.0.0-beta.5 (2021-07-07) ### Breaking Changes - -### Key Bugs Fixed - -### Fixed - +- Renamed `ServiceBusEntityType` property to `EntityType`. +- Renamed `messageActions` and `sessionActions` parameters to `actions` in `MessageProcessor` and `SessionMessageProcessor`. +- Renamed `MaxBatchSize` to `MaxMessageBatchSize` in `ServiceBusOptions`. ## 5.0.0-beta.4 (2021-06-22) diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/api/Microsoft.Azure.WebJobs.Extensions.ServiceBus.netstandard2.0.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/api/Microsoft.Azure.WebJobs.Extensions.ServiceBus.netstandard2.0.cs index 56062c54111a..6444b76b9776 100644 --- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/api/Microsoft.Azure.WebJobs.Extensions.ServiceBus.netstandard2.0.cs +++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/api/Microsoft.Azure.WebJobs.Extensions.ServiceBus.netstandard2.0.cs @@ -13,10 +13,10 @@ public ServiceBusAccountAttribute(string account) { } [System.Diagnostics.DebuggerDisplayAttribute("{QueueOrTopicName,nq}")] public sealed partial class ServiceBusAttribute : System.Attribute, Microsoft.Azure.WebJobs.IConnectionProvider { - public ServiceBusAttribute(string queueOrTopicName, Microsoft.Azure.WebJobs.ServiceBus.ServiceBusEntityType serviceBusEntityType = Microsoft.Azure.WebJobs.ServiceBus.ServiceBusEntityType.Queue) { } + public ServiceBusAttribute(string queueOrTopicName, Microsoft.Azure.WebJobs.ServiceBus.ServiceBusEntityType entityType = Microsoft.Azure.WebJobs.ServiceBus.ServiceBusEntityType.Queue) { } public string Connection { get { throw null; } set { } } + public Microsoft.Azure.WebJobs.ServiceBus.ServiceBusEntityType EntityType { get { throw null; } set { } } public string QueueOrTopicName { get { throw null; } } - public Microsoft.Azure.WebJobs.ServiceBus.ServiceBusEntityType ServiceBusEntityType { get { throw null; } set { } } } [Microsoft.Azure.WebJobs.ConnectionProviderAttribute(typeof(Microsoft.Azure.WebJobs.ServiceBusAccountAttribute))] [Microsoft.Azure.WebJobs.Description.BindingAttribute] @@ -40,8 +40,8 @@ public partial class MessageProcessor { public MessageProcessor(Azure.Messaging.ServiceBus.ServiceBusProcessor processor) { } protected internal Azure.Messaging.ServiceBus.ServiceBusProcessor Processor { get { throw null; } } - protected internal virtual System.Threading.Tasks.Task BeginProcessingMessageAsync(Microsoft.Azure.WebJobs.ServiceBus.ServiceBusMessageActions messageActions, Azure.Messaging.ServiceBus.ServiceBusReceivedMessage message, System.Threading.CancellationToken cancellationToken) { throw null; } - protected internal virtual System.Threading.Tasks.Task CompleteProcessingMessageAsync(Microsoft.Azure.WebJobs.ServiceBus.ServiceBusMessageActions messageActions, Azure.Messaging.ServiceBus.ServiceBusReceivedMessage message, Microsoft.Azure.WebJobs.Host.Executors.FunctionResult result, System.Threading.CancellationToken cancellationToken) { throw null; } + protected internal virtual System.Threading.Tasks.Task BeginProcessingMessageAsync(Microsoft.Azure.WebJobs.ServiceBus.ServiceBusMessageActions actions, Azure.Messaging.ServiceBus.ServiceBusReceivedMessage message, System.Threading.CancellationToken cancellationToken) { throw null; } + protected internal virtual System.Threading.Tasks.Task CompleteProcessingMessageAsync(Microsoft.Azure.WebJobs.ServiceBus.ServiceBusMessageActions actions, Azure.Messaging.ServiceBus.ServiceBusReceivedMessage message, Microsoft.Azure.WebJobs.Host.Executors.FunctionResult result, System.Threading.CancellationToken cancellationToken) { throw null; } } public partial class MessagingProvider { @@ -77,9 +77,9 @@ public ServiceBusOptions() { } public System.Func ExceptionHandler { get { throw null; } set { } } public Newtonsoft.Json.JsonSerializerSettings JsonSerializerSettings { get { throw null; } set { } } public System.TimeSpan MaxAutoLockRenewalDuration { get { throw null; } set { } } - public int MaxBatchSize { get { throw null; } set { } } public int MaxConcurrentCalls { get { throw null; } set { } } public int MaxConcurrentSessions { get { throw null; } set { } } + public int MaxMessageBatchSize { get { throw null; } set { } } public int PrefetchCount { get { throw null; } set { } } public System.TimeSpan? SessionIdleTimeout { get { throw null; } set { } } public Azure.Messaging.ServiceBus.ServiceBusTransportType TransportType { get { throw null; } set { } } @@ -96,8 +96,8 @@ public partial class SessionMessageProcessor { public SessionMessageProcessor(Azure.Messaging.ServiceBus.ServiceBusSessionProcessor processor) { } protected internal Azure.Messaging.ServiceBus.ServiceBusSessionProcessor Processor { get { throw null; } } - public virtual System.Threading.Tasks.Task BeginProcessingMessageAsync(Microsoft.Azure.WebJobs.ServiceBus.ServiceBusSessionMessageActions sessionActions, Azure.Messaging.ServiceBus.ServiceBusReceivedMessage message, System.Threading.CancellationToken cancellationToken) { throw null; } - public virtual System.Threading.Tasks.Task CompleteProcessingMessageAsync(Microsoft.Azure.WebJobs.ServiceBus.ServiceBusSessionMessageActions sessionActions, Azure.Messaging.ServiceBus.ServiceBusReceivedMessage message, Microsoft.Azure.WebJobs.Host.Executors.FunctionResult result, System.Threading.CancellationToken cancellationToken) { throw null; } + public virtual System.Threading.Tasks.Task BeginProcessingMessageAsync(Microsoft.Azure.WebJobs.ServiceBus.ServiceBusSessionMessageActions actions, Azure.Messaging.ServiceBus.ServiceBusReceivedMessage message, System.Threading.CancellationToken cancellationToken) { throw null; } + public virtual System.Threading.Tasks.Task CompleteProcessingMessageAsync(Microsoft.Azure.WebJobs.ServiceBus.ServiceBusSessionMessageActions actions, Azure.Messaging.ServiceBus.ServiceBusReceivedMessage message, Microsoft.Azure.WebJobs.Host.Executors.FunctionResult result, System.Threading.CancellationToken cancellationToken) { throw null; } } } namespace Microsoft.Extensions.Hosting diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Bindings/ServiceBusBinding.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Bindings/ServiceBusBinding.cs index 1f9786c0d931..b1a54ea9ac49 100644 --- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Bindings/ServiceBusBinding.cs +++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Bindings/ServiceBusBinding.cs @@ -53,7 +53,7 @@ public async Task BindAsync(BindingContext context) var entity = new ServiceBusEntity { MessageSender = messageSender, - ServiceBusEntityType = _attribute.ServiceBusEntityType, + ServiceBusEntityType = _attribute.EntityType, }; return await BindAsync(entity, context.ValueContext).ConfigureAwait(false); diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Bindings/StringToServiceBusEntityConverter.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Bindings/StringToServiceBusEntityConverter.cs index 64f9a57823f4..1efa9d4652bc 100644 --- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Bindings/StringToServiceBusEntityConverter.cs +++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Bindings/StringToServiceBusEntityConverter.cs @@ -19,7 +19,7 @@ public StringToServiceBusEntityConverter(ServiceBusAttribute attribute, IBindabl { _attribute = attribute; _defaultPath = defaultPath; - _serviceBusEntityType = _attribute.ServiceBusEntityType; + _serviceBusEntityType = _attribute.EntityType; _messagingProvider = messagingProvider; _clientFactory = clientFactory; } diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusOptions.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusOptions.cs index 36ddbbc4b04f..d34028a4c093 100644 --- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusOptions.cs +++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Config/ServiceBusOptions.cs @@ -129,7 +129,7 @@ public int MaxConcurrentSessions /// Gets or sets the maximum number of messages that will be passed to each function call. This only applies for functions that receive /// a batch of messages. The default value is 1000. /// - public int MaxBatchSize { get; set; } = 1000; + public int MaxMessageBatchSize { get; set; } = 1000; /// /// Gets or sets the maximum amount of time to wait for a message to be received for the @@ -179,7 +179,7 @@ string IOptionsFormatter.Format() { nameof(MaxAutoLockRenewalDuration), MaxAutoLockRenewalDuration }, { nameof(MaxConcurrentCalls), MaxConcurrentCalls }, { nameof(MaxConcurrentSessions), MaxConcurrentSessions }, - { nameof(MaxBatchSize), MaxBatchSize }, + { nameof(MaxMessageBatchSize), MaxMessageBatchSize }, { nameof(SessionIdleTimeout), SessionIdleTimeout.ToString() ?? string.Empty } }; diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusListener.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusListener.cs index 903fe41ad0d4..a9cb3d5e09af 100644 --- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusListener.cs +++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusListener.cs @@ -299,7 +299,7 @@ private async Task RunBatchReceiveLoopAsync(CancellationToken cancellationToken) IReadOnlyList messages = await receiver.ReceiveMessagesAsync( - _serviceBusOptions.MaxBatchSize, + _serviceBusOptions.MaxMessageBatchSize, cancellationToken: cancellationToken).AwaitWithCancellation(cancellationToken); if (messages.Count > 0) diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Primitives/MessageProcessor.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Primitives/MessageProcessor.cs index 1780affede4f..997cfaa44ddd 100644 --- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Primitives/MessageProcessor.cs +++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Primitives/MessageProcessor.cs @@ -32,11 +32,11 @@ public MessageProcessor(ServiceBusProcessor processor) /// This method is called when there is a new message to process, before the job function is invoked. /// This allows any preprocessing to take place on the message before processing begins. /// - /// The set of actions that can be performed on a . + /// The set of actions that can be performed on a . /// The to process. /// A cancellation token that will be cancelled when the processor is shutting down. /// A that returns true if the message processing should continue, false otherwise. - protected internal virtual Task BeginProcessingMessageAsync(ServiceBusMessageActions messageActions, ServiceBusReceivedMessage message, CancellationToken cancellationToken) + protected internal virtual Task BeginProcessingMessageAsync(ServiceBusMessageActions actions, ServiceBusReceivedMessage message, CancellationToken cancellationToken) { return Task.FromResult(true); } @@ -49,12 +49,12 @@ protected internal virtual Task BeginProcessingMessageAsync(ServiceBusMess /// is configured. E.g. if is false, it is up to the job function to complete /// the message. /// - /// The set of actions that can be performed on a . + /// The set of actions that can be performed on a . /// The to process. /// The from the job invocation. /// A cancellation token that will be cancelled when the processor is shutting down. /// A that will complete the message processing. - protected internal virtual Task CompleteProcessingMessageAsync(ServiceBusMessageActions messageActions, ServiceBusReceivedMessage message, FunctionResult result, CancellationToken cancellationToken) + protected internal virtual Task CompleteProcessingMessageAsync(ServiceBusMessageActions actions, ServiceBusReceivedMessage message, FunctionResult result, CancellationToken cancellationToken) { if (message is null) { diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Primitives/SessionMessageProcessor.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Primitives/SessionMessageProcessor.cs index dd4145f1a651..214e5fe19b5c 100644 --- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Primitives/SessionMessageProcessor.cs +++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Primitives/SessionMessageProcessor.cs @@ -29,11 +29,11 @@ public SessionMessageProcessor(ServiceBusSessionProcessor processor) /// This method is called when there is a new message to process, before the job function is invoked. /// This allows any preprocessing to take place on the message before processing begins. /// - /// - /// + /// The set of actions that can be performed on a . + /// The to process. /// The to use. /// A that returns true if the message processing should continue, false otherwise. - public virtual Task BeginProcessingMessageAsync(ServiceBusSessionMessageActions sessionActions, ServiceBusReceivedMessage message, CancellationToken cancellationToken) + public virtual Task BeginProcessingMessageAsync(ServiceBusSessionMessageActions actions, ServiceBusReceivedMessage message, CancellationToken cancellationToken) { return Task.FromResult(true); } @@ -46,12 +46,12 @@ public virtual Task BeginProcessingMessageAsync(ServiceBusSessionMessageAc /// is configured. E.g. if is false, it is up to the job function to complete /// the message. /// - /// - /// + /// The set of actions that can be performed on a . + /// The to process. /// The from the job invocation. /// The to use /// A that will complete the message processing. - public virtual Task CompleteProcessingMessageAsync(ServiceBusSessionMessageActions sessionActions, ServiceBusReceivedMessage message, FunctionResult result, CancellationToken cancellationToken) + public virtual Task CompleteProcessingMessageAsync(ServiceBusSessionMessageActions actions, ServiceBusReceivedMessage message, FunctionResult result, CancellationToken cancellationToken) { if (result == null) { diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/ServiceBusAttribute.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/ServiceBusAttribute.cs index 6e3c54a48e50..23e70d6191b7 100644 --- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/ServiceBusAttribute.cs +++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/ServiceBusAttribute.cs @@ -15,7 +15,7 @@ namespace Microsoft.Azure.WebJobs ///// ///// The method parameter type can be one of the following: ///// - ///// BrokeredMessage (out parameter) + ///// ServiceBusMessage (out parameter) ///// (out parameter) ///// (out parameter) ///// A user-defined type (out parameter, serialized as JSON) @@ -34,11 +34,11 @@ public sealed class ServiceBusAttribute : Attribute, IConnectionProvider /// Initializes a new instance of the class. /// /// The name of the queue or topic to bind to. - /// The type of the entity to bind to. - public ServiceBusAttribute(string queueOrTopicName, ServiceBusEntityType serviceBusEntityType = ServiceBusEntityType.Queue) + /// The type of the entity to bind to. + public ServiceBusAttribute(string queueOrTopicName, ServiceBusEntityType entityType = ServiceBusEntityType.Queue) { QueueOrTopicName = queueOrTopicName; - ServiceBusEntityType = serviceBusEntityType; + EntityType = entityType; } /// @@ -54,6 +54,6 @@ public ServiceBusAttribute(string queueOrTopicName, ServiceBusEntityType service /// /// Value indicating the type of the entity to bind to. /// - public ServiceBusEntityType ServiceBusEntityType { get; set; } + public ServiceBusEntityType EntityType { get; set; } } } diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/ServiceBusEndToEndTests.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/ServiceBusEndToEndTests.cs index 6b42325d3484..7258997339fc 100644 --- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/ServiceBusEndToEndTests.cs +++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/ServiceBusEndToEndTests.cs @@ -749,7 +749,7 @@ public static async Task ServiceBusBinderTest( { var attribute = new ServiceBusAttribute(_firstQueueScope.QueueName) { - ServiceBusEntityType = ServiceBusEntityType.Queue + EntityType = ServiceBusEntityType.Queue }; var collector = await binder.BindAsync>(attribute); @@ -773,7 +773,7 @@ public static void ServiceBusBinderTest( { var attribute = new ServiceBusAttribute(_firstQueueScope.QueueName) { - ServiceBusEntityType = ServiceBusEntityType.Queue + EntityType = ServiceBusEntityType.Queue }; var collector = binder.Bind>(attribute); @@ -1140,16 +1140,16 @@ public CustomMessageProcessor(ServiceBusProcessor processor, ILogger logger) _logger = logger; } - protected internal override async Task BeginProcessingMessageAsync(ServiceBusMessageActions messageActions, ServiceBusReceivedMessage message, CancellationToken cancellationToken) + protected internal override async Task BeginProcessingMessageAsync(ServiceBusMessageActions actions, ServiceBusReceivedMessage message, CancellationToken cancellationToken) { _logger?.LogInformation("Custom processor Begin called!"); - return await base.BeginProcessingMessageAsync(messageActions, message, cancellationToken); + return await base.BeginProcessingMessageAsync(actions, message, cancellationToken); } - protected internal override async Task CompleteProcessingMessageAsync(ServiceBusMessageActions messageActions, ServiceBusReceivedMessage message, Executors.FunctionResult result, CancellationToken cancellationToken) + protected internal override async Task CompleteProcessingMessageAsync(ServiceBusMessageActions actions, ServiceBusReceivedMessage message, Executors.FunctionResult result, CancellationToken cancellationToken) { _logger?.LogInformation("Custom processor End called!"); - await base.CompleteProcessingMessageAsync(messageActions, message, result, cancellationToken); + await base.CompleteProcessingMessageAsync(actions, message, result, cancellationToken); } } } diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/ServiceBusSessionsEndToEndTests.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/ServiceBusSessionsEndToEndTests.cs index ce48fcbf0463..ef157e0fd390 100644 --- a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/ServiceBusSessionsEndToEndTests.cs +++ b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/ServiceBusSessionsEndToEndTests.cs @@ -751,21 +751,21 @@ public CustomSessionMessageProcessor( } public override async Task BeginProcessingMessageAsync( - ServiceBusSessionMessageActions sessionActions, + ServiceBusSessionMessageActions actions, ServiceBusReceivedMessage message, CancellationToken cancellationToken) { _logger?.LogInformation("Custom processor Begin called!" + message.Body.ToString()); - return await base.BeginProcessingMessageAsync(sessionActions, message, cancellationToken); + return await base.BeginProcessingMessageAsync(actions, message, cancellationToken); } public override async Task CompleteProcessingMessageAsync( - ServiceBusSessionMessageActions sessionActions, + ServiceBusSessionMessageActions actions, ServiceBusReceivedMessage message, Executors.FunctionResult result, CancellationToken cancellationToken) { _logger?.LogInformation("Custom processor End called!" + message.Body.ToString()); - await base.CompleteProcessingMessageAsync(sessionActions, message, result, cancellationToken); + await base.CompleteProcessingMessageAsync(actions, message, result, cancellationToken); } } }